diff --git a/pmd-jbuilder/etc/build.xml b/pmd-jbuilder/etc/build.xml
index a2785cb927..2401e5eeab 100644
--- a/pmd-jbuilder/etc/build.xml
+++ b/pmd-jbuilder/etc/build.xml
@@ -5,8 +5,8 @@
 <property name="dir.build" value="build\"/>
 <property name="dir.rulesets" value="rulesets\"/>
 <property name="dir.regress" value="regress\"/>
-<property name="version" value="1.5"/>
-<property name="pmd.version" value="3.4"/>
+<property name="version" value="1.6"/>
+<property name="pmd.version" value="3.7"/>
 
 <path id="dependencies.path">
     <pathelement location="${dir.build}"/>
diff --git a/pmd-jbuilder/etc/changelog.txt b/pmd-jbuilder/etc/changelog.txt
index 4e6621b6b5..c121b74327 100644
--- a/pmd-jbuilder/etc/changelog.txt
+++ b/pmd-jbuilder/etc/changelog.txt
@@ -1,3 +1,6 @@
+Aug 7, 2006 - 1.6:
+Updated to PMD 3.7
+
 December 8, 2005 - 1.5:
 Updated to PMD 3.4
 
diff --git a/pmd-jbuilder/etc/doing_the_next_pmd_jbuilder_release.txt b/pmd-jbuilder/etc/doing_the_next_pmd_jbuilder_release.txt
index d9db3c2f98..c623b30aff 100644
--- a/pmd-jbuilder/etc/doing_the_next_pmd_jbuilder_release.txt
+++ b/pmd-jbuilder/etc/doing_the_next_pmd_jbuilder_release.txt
@@ -1,37 +1,38 @@
 Update the release date in the changelog
-Update the version number in build.xml.
+Update the plugin version number and PMD version number in build.xml
+Update the plugin version number and PMD version number here
 
 ant dist
-rm -rf ~/tmp/pmd-jbuilder-1.5/
-mkdir -p ~/tmp/pmd-jbuilder-1.5/
-cp ../lib/pmd-3.4.jar ../lib/PMDOpenTool.jar ../lib/jaxen-1.1-beta-7.jar ~/tmp/pmd-jbuilder-1.5/
-cp ../LICENSE.txt ~/tmp/pmd-jbuilder-1.5/
-cp ../lib/ReadMe.txt ~/tmp/pmd-jbuilder-1.5/
-cd ~/tmp/pmd-jbuilder-1.5
-zip -q -r ../pmd-jbuilder-bin-1.5.zip *
+rm -rf ~/tmp/pmd-jbuilder-1.6/
+mkdir -p ~/tmp/pmd-jbuilder-1.6/
+cp ../lib/pmd-3.7.jar ../lib/PMDOpenTool.jar ../lib/jaxen-1.1-beta-7.jar ../lib/jakarta-oro-2.0.8.jar ~/tmp/pmd-jbuilder-1.6/
+cp ../LICENSE.txt ~/tmp/pmd-jbuilder-1.6/
+cp ../lib/ReadMe.txt ~/tmp/pmd-jbuilder-1.6/
+cd ~/tmp/pmd-jbuilder-1.6
+zip -q -r ../pmd-jbuilder-bin-1.6.zip *
 cd -
 
 CVSROOT=:ext:tomcopeland@cvs.sourceforge.net:/cvsroot/pmd && export CVSROOT
 cd ../../
-cvs -q tag -D tomorrow "pmd_jbuilder_release_1_5" pmd-jbuilder
+cvs -q tag -D tomorrow "pmd_jbuilder_release_1_6" pmd-jbuilder
 
 Create the src release:
-rm -rf ~/tmp/pmd-jbuilder-1.5
-rm -rf ~/tmp/pmd-jbuilder-1.5.zip
+rm -rf ~/tmp/pmd-jbuilder-1.6
+rm -rf ~/tmp/pmd-jbuilder-1.6.zip
 cd pmd-jbuilder/etc/
 ant jarsrc
 cd ../../
 rm -rf tmp/
 mkdir tmp
 cd tmp
-cvs -q export -r pmd_jbuilder_release_1_5 pmd-jbuilder
-mv pmd-jbuilder/ pmd-jbuilder-1.5/
+cvs -q export -r pmd_jbuilder_release_1_6 pmd-jbuilder
+mv pmd-jbuilder/ pmd-jbuilder-1.6/
 cd ..
-cp pmd-jbuilder/lib/pmd-jbuilder-src-1.5.jar tmp/pmd-jbuilder-1.5/lib/
-mv tmp/pmd-jbuilder-1.5/ ~/tmp/
-cp pmd-jbuilder/lib/PMDOpenTool.jar ~/tmp/pmd-jbuilder-1.5/lib
+cp pmd-jbuilder/lib/pmd-jbuilder-src-1.6.jar tmp/pmd-jbuilder-1.6/lib/
+mv tmp/pmd-jbuilder-1.6/ ~/tmp/
+cp pmd-jbuilder/lib/PMDOpenTool.jar ~/tmp/pmd-jbuilder-1.6/lib
 cd ~/tmp/
-zip -q -r pmd-jbuilder-src-1.5.zip pmd-jbuilder-1.5/
+zip -q -r pmd-jbuilder-src-1.6.zip pmd-jbuilder-1.6/
 
 Unzip binary release into the JBuilder lib/ext directory
 TESTS:
@@ -42,7 +43,7 @@ if you see a bug and fix it, you can delete the release using:
 cvs rtag -d pmd_jbuilder_release_1_5 pmd-jbuilder
 and then retag everything
 
-ncftpput upload.sourceforge.net incoming/ pmd-jbuilder-src-1.5.zip pmd-jbuilder-bin-1.5.zip
+ncftpput upload.sourceforge.net incoming/ pmd-jbuilder-src-1.6.zip pmd-jbuilder-bin-1.6.zip
 
 Go to Admin, Edit/Release Files, click on Add new release
 Paste stuff into the changelog/readme boxes
diff --git a/pmd-jbuilder/lib/jakarta-oro-2.0.8.jar b/pmd-jbuilder/lib/jakarta-oro-2.0.8.jar
new file mode 100644
index 0000000000..23488d2600
Binary files /dev/null and b/pmd-jbuilder/lib/jakarta-oro-2.0.8.jar differ
diff --git a/pmd-jbuilder/lib/pmd-3.7.jar b/pmd-jbuilder/lib/pmd-3.7.jar
index 6064b98881..3a516deb11 100644
Binary files a/pmd-jbuilder/lib/pmd-3.7.jar and b/pmd-jbuilder/lib/pmd-3.7.jar differ