--- a/bin/buildit
+++ b/bin/buildit
@@ -2,11 +2,11 @@
 #
 #  This file is part of the Jikes RVM project (http://jikesrvm.org).
 #
-#  This file is licensed to You under the Common Public License (CPL);
+#  This file is licensed to You under the Eclipse Public License (EPL);
 #  You may not use this file except in compliance with the License. You
 #  may obtain a copy of the License at
 #
-#      http://www.opensource.org/licenses/cpl1.0.php
+#      http://www.opensource.org/licenses/eclipse-1.0.php
 #
 #  See the COPYRIGHT.txt file distributed with this work for information
 #  regarding copyright ownership.
@@ -434,7 +434,7 @@
 # Configuration 
 #
 if ($test_set && !$checkstyle) {
-  $checkstyle = `grep require.checkstyle $localRoot/build/test-runs/$test_set.properties`;
+  $checkstyle = `grep ^require.checkstyle=true\$ $localRoot/build/test-runs/$test_set.properties`;
   chomp($checkstyle);
   if ($checkstyle ne "") {
     $checkstyle = 1;
@@ -597,11 +597,13 @@
     }
     $rsync .= "rsync -azvLe ssh --delete --exclude=.svn --exclude=\*.class ".$sourcedirs." $sshHost:$hostRoot";
     if ($host ne $target) {
-      $rsync .= ";\nssh $sshTarget -t mkdir -p $targetRoot";
-      $rsync .= ";\nrsync -azvLe ssh --delete --exclude=.svn --exclude=\*.class ".$sourcedirs." $sshTarget:$targetRoot";
-      if ($compcachedir ne "") {
-        $rsync .= ";\nssh $sshTarget -t mkdir -p $targetCompCache;\n";
-        $rsync .= "rsync -azvLe ssh --delete $localCompCache/ $sshTarget:$targetCompCache;\n";
+      $rsync .= ";\nssh $sshTarget -t mkdir -p $targetRoot/dist";
+      if ($hostConfig ne $targetConfig) {
+        $rsync .= ";\nrsync -azvLe ssh --delete --exclude=.svn --exclude=\*.class ".$sourcedirs." $sshTarget:$targetRoot";
+        if ($compcachedir ne "") {
+          $rsync .= ";\nssh $sshTarget -t mkdir -p $targetCompCache;\n";
+          $rsync .= "rsync -azvLe ssh --delete $localCompCache/ $sshTarget:$targetCompCache;\n";
+        }
       }
     }
     print "$rsync\n\n";