diff --git a/pmd/etc/MANIFEST.MF b/pmd/etc/MANIFEST.MF
new file mode 100644
index 0000000000..5561b24ef7
--- /dev/null
+++ b/pmd/etc/MANIFEST.MF
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+Created-By: Ant 1.4.1
+Main-class: net.sourceforge.pmd.PMD
+
diff --git a/pmd/etc/build.xml b/pmd/etc/build.xml
index 9c3b053e1e..5a650956dd 100644
--- a/pmd/etc/build.xml
+++ b/pmd/etc/build.xml
@@ -45,7 +45,7 @@
                 <include name="*.properties"/>
             </fileset>
         </copy>
-        <jar jarfile="${lib}\pmd-${version}.jar" basedir="${build}" excludes="test/**/*.class"/>
+        <jar jarfile="${lib}\pmd-${version}.jar" basedir="${build}" manifest="etc/MANIFEST.MF" excludes="test/**/*.class"/>
     </target>
 
     <target name="pmd">
diff --git a/pmd/etc/run.bat b/pmd/etc/run.bat
index c9d7999acd..575251ed41 100755
--- a/pmd/etc/run.bat
+++ b/pmd/etc/run.bat
@@ -1,6 +1,5 @@
 @echo off
-set CLASSPATH=../lib/pmd-0.9.jar
 set FILE=%1%
 set FORMAT=%2%
 set RULESETFILE=%3%
-java net.sourceforge.pmd.PMD %FILE% %FORMAT% %RULESETFILE%
+java -jar ../lib/pmd-0.9.jar %FILE% %FORMAT% %RULESETFILE%