diff --git a/pmd-dcpd/etc/build.xml b/pmd-dcpd/etc/build.xml
index 62606a588d..e9dc9a3900 100644
--- a/pmd-dcpd/etc/build.xml
+++ b/pmd-dcpd/etc/build.xml
@@ -5,6 +5,7 @@
 <property name="src" value="src\"/>
 <property name="build" value="build\"/>
 <property name="jar" value="dcpd.jar"/>
+<property name="clientzipfile" value="client.zip"/>
 <property name="build.compiler" value="jikes"/>
 
 <target name="delete">
@@ -45,13 +46,16 @@
 </target>
 
 <target name="buildworker" depends="clean,jar">
+   <delete dir="${clientzipfile}"/>
+   <delete dir="staging"/>
    <mkdir dir="staging"/>
    <copy file="${lib}/dcpd.jar" toDir="staging"/>
    <copy file="${lib}/pmd-0.9.jar" toDir="staging"/>
    <copy file="${lib}/runtimeonly/outrigger-dl.jar" toDir="staging"/>
    <copy file="${lib}/runtimeonly/reggie.jar" toDir="staging"/>
    <copy file="c:\jini-1_2_1\policy\policy.all" toDir="staging"/>
-   <zip zipfile="client.zip" basedir="staging"/>
+   <copy file="etc/linuxclient_go.sh" toDir="staging"/>
+   <zip zipfile="${clientzipfile}" basedir="staging"/>
 </target>
 
 
diff --git a/pmd-dcpd/etc/linuxclient_go.sh b/pmd-dcpd/etc/linuxclient_go.sh
index 6c6d8f00b2..cda9361290 100644
--- a/pmd-dcpd/etc/linuxclient_go.sh
+++ b/pmd-dcpd/etc/linuxclient_go.sh
@@ -1,14 +1,17 @@
-@echo off
-set CLASSPATH=
-set CLASSPATH=/home/tom/dcpdworker/outrigger-dl.jar
-set CLASSPATH=$CLASSPATH:/home/tom/dcpdworker/reggie.jar
-set CLASSPATH=$CLASSPATH:/home/tom/dcpdworker/pmd-0.9.jar
+#!/bin/bash
+
+CLASSPATH=/home/tom/dcpdworker/outrigger-dl.jar
+CLASSPATH=$CLASSPATH:/home/tom/dcpdworker/reggie.jar
+CLASSPATH=$CLASSPATH:/home/tom/dcpdworker/pmd-0.9.jar
+CLASSPATH=$CLASSPATH:/home/tom/dcpdworker/dcpd.jar
+
+MAIN=net.sourceforge.pmd.dcpd.DCPDWorker
+MEMORY_ARG="-Xms128M -Xmx384M"
+POLICY_ARG=-Djava.security.policy=/home/tom/dcpdworker/policy.all
+SPACENAME_ARG=-Dcom.sun.jini.outrigger.spacename=JavaSpaces
+GROUP_ARG=-Dcom.sun.jini.lookup.groups=public
+CODEBASE=-Djava.rmi.server.codebase=http://mordor:8081/dcpd.jar
+
+java $MEMORY_ARG $POLICY_ARG $SPACENAME_ARG $GROUP_ARG -cp $CLASSPATH $CODEBASE $MAIN
 
-set MAIN=net.sourceforge.pmd.dcpd.%1
-set MEMORY_ARG=-Xms128M -Xmx384M
-set POLICY_ARG=-Djava.security.policy=/home/tom/dcpdworker/policy.all
-set SPACENAME_ARG=-Dcom.sun.jini.outrigger.spacename=JavaSpaces
-set GROUP_ARG=-Dcom.sun.jini.lookup.groups=public
-set CODEBASE=-Djava.rmi.server.codebase=http://mordor:8081/dcpd.jar
 
-java $MEMORY_ARG $POLICY_ARG $SPACENAME_ARG $GROUP_ARG -cp $CLASSPATH $CODEBASE $MAIN $2