diff -u bin.orig/build.xml bin/build.xml
--- bin.orig/build.xml	2005-05-20 19:49:46.000000000 +0200
+++ bin/build.xml	2005-05-20 20:25:51.000000000 +0200
@@ -1,20 +1,16 @@
 <project name="pmd" default="compile" basedir="../">
 
-<property name="dir.lib" value="lib\"/>
-<property name="dir.src" value="src\"/>
-<property name="dir.build" value="build\"/>
-<property name="dir.rulesets" value="rulesets\"/>
-<property name="dir.regress" value="regress\"/>
+	<property name="dir.lib" value="lib/"/>
+	<property name="dir.src" value="src/"/>
+	<property name="dir.build" value="build/"/>
+	<property name="dir.rulesets" value="rulesets/"/>
+	<property name="dir.regress" value="regress/"/>
 <property name="version" value="3.1"/>
 <property name="jnlp_staging_area" value="/home/tom/misc/importscrubberjnlp/"/>
 
 <path id="dependencies.path">
-    <pathelement location="${dir.build}"/>
     <fileset dir="${dir.lib}">
-        <include name="jaxen-core-1.0-fcs.jar"/>
-        <include name="saxpath-1.0-fcs.jar"/>
-        <include name="xercesImpl-2.6.2.jar"/>
-        <include name="xmlParserAPIs-2.6.2.jar"/>
+	    <include name="**/*.jar"/>
     </fileset>
 </path>
 
@@ -54,12 +50,11 @@
 
 <target name="jar" depends="copy,compile" description="Jars up the classes and rulesets">
     <jar
-        jarfile="${dir.lib}\pmd-${version}.jar"
+        jarfile="${dir.lib}\pmd.jar"
         includes="net/sourceforge/pmd/**/**,test/net/sourceforge/pmd/testframework/**/**,rulesets/**"
         basedir="${dir.build}">
         <manifest>
             <attribute name="Main-Class" value="net.sourceforge.pmd.PMD"/>
-            <attribute name="Class-Path" value="jaxen-core-1.0-fcs.jar saxpath-1.0-fcs.jar"/>
         </manifest>
     </jar>  
 </target>
diff -u bin.orig/designer.sh bin/designer.sh
--- bin.orig/designer.sh	2005-05-20 19:49:46.000000000 +0200
+++ bin/designer.sh	2005-05-20 20:41:53.000000000 +0200
@@ -1,34 +1,11 @@
 #!/bin/bash
 
-SCRIPT_DIR=`dirname $0`
-CWD="$PWD"
+cp=$(java-config -p xerces-2,saxpath,jaxen,pmd)
 
-cd "$SCRIPT_DIR/../lib"
-LIB_DIR=`pwd -P`
-
-classpath=$CLASSPATH
-
-build_dir="$SCRIPT_DIR/../build"
-
-if [ -d "$build_dir" ]; then
-    cd "$build_dir"
-    build_dir=`pwd -P`
-    classpath=$classpath:$build_dir
-fi
-
-cd "$CWD"
-
-for jarfile in `ls $LIB_DIR/*.jar`; do
-    classpath=$classpath:$jarfile
-done
-
-
-FILE=$1
+FILE=${1}
 shift
-FORMAT=$1
+FORMAT=${1}
 shift
-RULESETFILES="$@"
-
-# echo "CLASSPATH: $classpath"
+RULESETFILES="${@}"
 
-java -cp $classpath net.sourceforge.pmd.util.designer.Designer
+java -cp ${cp} net.sourceforge.pmd.util.designer.Designer
diff -u bin.orig/pmd.sh bin/pmd.sh
--- bin.orig/pmd.sh	2005-05-20 19:49:46.000000000 +0200
+++ bin/pmd.sh	2005-05-20 20:41:47.000000000 +0200
@@ -1,41 +1,20 @@
 #!/bin/bash
 
-if [ -z "$3" ]; then
-    script=`basename $0`
+if [ -z "${3}" ]; then
+    script=$(basename $0)
     echo "Usage:"
-    echo "    $script <java-src-file> html|xml|text|vbhtml rulesetfile1[,rulesetfile2[,..]]"
+    echo "    ${script} <java-src-file> html|xml|text|vbhtml rulesetfile1[,rulesetfile2[,..]]"
     exit 1
 fi
 
-SCRIPT_DIR=`dirname $0`
-CWD="$PWD"
+cp=$(java-config -p xerces-2,saxpath,jaxen,pmd)
 
-cd "$SCRIPT_DIR/../lib"
-LIB_DIR=`pwd -P`
-
-classpath=$CLASSPATH
-
-build_dir="$SCRIPT_DIR/../build"
-
-if [ -d "$build_dir" ]; then
-    cd "$build_dir"
-    build_dir=`pwd -P`
-    classpath=$classpath:$build_dir
-fi
-
-cd "$CWD"
-
-for jarfile in `ls $LIB_DIR/*.jar`; do
-    classpath=$classpath:$jarfile
-done
-
-
-FILE=$1
+FILE=${1}
 shift
-FORMAT=$1
+FORMAT=${1}
 shift
-RULESETFILES="$@"
+RULESETFILES="${@}"
 
 # echo "CLASSPATH: $classpath"
 
-java -cp $classpath net.sourceforge.pmd.PMD $FILE $FORMAT $RULESETFILES
+java -cp ${cp} net.sourceforge.pmd.PMD ${FILE} ${FORMAT} ${RULESETFILES}