diff --git a/build.xml b/build.xml
index 47d56cb4a..b4d9344df 100644
--- a/build.xml
+++ b/build.xml
@@ -350,6 +350,7 @@ BUILD LOCAL REFERENCE (LOCKER) LAYER
       file="${locker.dir}/bin/${fsc.exec.name}"
       name="Fast Scala compiler"
       class="scala.tools.nsc.CompileClient"
+      toolflags='-JDjava.class.path="$MERGED_CLASSPATH"'
       version="${version.number}"
       copyright="${copyright.string}"
       javaFlags="-Xmx256M -Xms16M"/>
@@ -477,8 +478,9 @@ BUILD QUICK-TEST LAYER
       copyright="${copyright.string}"/>
     <quicktool
       file="${quick.dir}/bin/${fsc.exec.name}"
-      name="Scala scripting tool"
+      name="Fast Scala compiler"
       class="scala.tools.nsc.CompileClient"
+      toolflags='-JDjava.class.path="$MERGED_CLASSPATH"'
       version="${version.number}"
       copyright="${copyright.string}"/>
     <chmod perm="ugo+rx"
@@ -607,8 +609,9 @@ TEST
       copyright="${copyright.string}"/>
     <straptool
       file="${strap.dir}/bin/${fsc.exec.name}"
-      name="Scala scripting tool"
+      name="Fast Scala compiler"
       class="scala.tools.nsc.CompileClient"
+      toolflags='-JDjava.class.path="$MERGED_CLASSPATH"'
       version="${version.number}"
       copyright="${copyright.string}"/>
     <chmod perm="ugo+rx"
@@ -865,7 +868,7 @@ GENERATES A DISTRIBUTION
         includes="clitest,diff.exe,lib*.dll,scalatest,scalatest.bat"/>
       <miscset
         dir="${basedir}/test"
-        includes="files/**/*.check,files/**/*.java,files/**/*.scala,files/cli/**/*.check.*"/>
+        includes="files/**/*.args,files/**/*.check,files/**/*.java,files/**/*.scala,files/cli/**/*.check.*"/>
     </quicksbaz>
   </target>
 
diff --git a/src/compiler/scala/tools/nsc/CompileClient.scala b/src/compiler/scala/tools/nsc/CompileClient.scala
index 826fc15a5..fb3459ae1 100755
--- a/src/compiler/scala/tools/nsc/CompileClient.scala
+++ b/src/compiler/scala/tools/nsc/CompileClient.scala
@@ -3,6 +3,7 @@
  * @author  Martin Odersky
  */
 // $Id: Main.scala 7679 2006-06-02 14:36:18 +0000 (Fri, 02 Jun 2006) odersky $
+
 package scala.tools.nsc
 
 import scala.tools.util.StringOps
@@ -37,9 +38,9 @@ object CompileClient {
       }
       i = i + 1
       if (i < args.length) {
-        if (arg == "-classpath" || 
-            arg == "-sourcepath" || 
-            arg == "-bootclasspath" || 
+        if (arg == "-classpath" ||
+            arg == "-sourcepath" ||
+            arg == "-bootclasspath" ||
             arg == "-extdirs" ||
             arg == "-d") {
           args(i) = absFileNames(args(i))
@@ -56,8 +57,10 @@ object CompileClient {
 
   def main(args: Array[String]): unit = {
     val Pair(vmArgs, serverAdr) = normalize(args)
-    if (args exists ("-verbose" ==))
-      System.out.println("[Server arguments: "+args.mkString("", " ", "]"))
+    if (args exists ("-verbose" ==)) {
+      System.out.println("[Server arguments: " + args.mkString("", " ", "]"))
+      System.out.println("[VM arguments: " + vmArgs + "]")
+    }
     val socket = if (serverAdr == "") CompileSocket.getOrCreateSocket(vmArgs)
                  else CompileSocket.getSocket(serverAdr)
     val out = new PrintWriter(socket.getOutputStream(), true)