diff --git a/pmd-eclipse-feature/feature.xml b/pmd-eclipse-feature/feature.xml
index 15184a5742..c42d71bf02 100644
--- a/pmd-eclipse-feature/feature.xml
+++ b/pmd-eclipse-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="net.sourceforge.pmd.eclipse"
       label="%feature.label"
-      version="3.1.7"
+      version="3.2.0"
       provider-name="%feature.provider_name"
       image="pmd_logo_small.jpg">
 
@@ -33,27 +33,27 @@
 
    <plugin
          id="net.sourceforge.pmd.eclipse"
-         unpack="false"
          download-size="0"
          install-size="0"
-         version="3.1.7"/>
+         version="3.2.0"
+         unpack="false"/>
 
    <plugin
          id="net.sourceforge.pmd.ui"
          download-size="0"
          install-size="0"
-         version="1.0.2"/>
+         version="3.2.0"/>
 
    <plugin
          id="net.sourceforge.pmd.runtime"
          download-size="0"
          install-size="0"
-         version="1.0.3"/>
+         version="3.2.0"/>
 
    <plugin
          id="net.sourceforge.pmd.core"
          download-size="0"
          install-size="0"
-         version="3.8.0"/>
+         version="3.9.0"/>
 
 </feature>
diff --git a/pmd-eclipse-runtime/plugin.xml b/pmd-eclipse-runtime/plugin.xml
index 1d1604bb1d..5aad4e984a 100644
--- a/pmd-eclipse-runtime/plugin.xml
+++ b/pmd-eclipse-runtime/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.pmd.runtime"
    name="PMD For Eclipse Runtime Plug-in"
-   version="1.0.3"
+   version="3.2.0"
    provider-name="PMD Development Team"
    class="net.sourceforge.pmd.runtime.PMDRuntimePlugin">
 
diff --git a/pmd-eclipse-test/plugin.xml b/pmd-eclipse-test/plugin.xml
index ef53f34aa4..9339da247e 100644
--- a/pmd-eclipse-test/plugin.xml
+++ b/pmd-eclipse-test/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.pmd.eclipse.test"
    name="PMD Eclipse Test Plug-in"
-   version="3.1.6"
+   version="3.2.0"
    provider-name="PMD Development Team">
 
    <runtime>
diff --git a/pmd-eclipse-test/test/testRuleSetsManager.rulesets b/pmd-eclipse-test/test/testRuleSetsManager.rulesets
index 57f9e82bd8..dc57beeab5 100644
--- a/pmd-eclipse-test/test/testRuleSetsManager.rulesets
+++ b/pmd-eclipse-test/test/testRuleSetsManager.rulesets
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rulesets xmlns:ns1="http://castor.exolab.org/" ns1:defaultRuleSet="basic"><ns1:ruleset ns1:name="basic" ns1:language="JAVA"><ns1:description></ns1:description><ns1:rule ns1:ref="rulesets/basic.xml/EmptyCatchBlock"/><ns1:rule ns1:ref="rulesets/basic.xml/EmptyIfStmt"/><ns1:rule ns1:ref="rulesets/basic.xml/EmptyWhileStmt"/><ns1:rule ns1:ref="rulesets/basic.xml/EmptyTryBlock"/><ns1:rule ns1:ref="rulesets/basic.xml/EmptyFinallyBlock"/><ns1:rule ns1:ref="rulesets/basic.xml/EmptySwitchStatements"/><ns1:rule ns1:ref="rulesets/basic.xml/JumbledIncrementer"/><ns1:rule ns1:ref="rulesets/basic.xml/ForLoopShouldBeWhileLoop"/><ns1:rule ns1:ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/><ns1:rule ns1:ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"/><ns1:rule ns1:ref="rulesets/basic.xml/DoubleCheckedLocking"/><ns1:rule ns1:ref="rulesets/basic.xml/ReturnFromFinallyBlock"/><ns1:rule ns1:ref="rulesets/basic.xml/EmptySynchronizedBlock"/><ns1:rule ns1:ref="rulesets/basic.xml/UnnecessaryReturn"/><ns1:rule ns1:ref="rulesets/basic.xml/EmptyStaticInitializer"/><ns1:rule ns1:ref="rulesets/basic.xml/UnconditionalIfStatement"/><ns1:rule ns1:ref="rulesets/basic.xml/EmptyStatementNotInLoop"/><ns1:rule ns1:ref="rulesets/basic.xml/BooleanInstantiation"/><ns1:rule ns1:ref="rulesets/basic.xml/UnnecessaryFinalModifier"/><ns1:rule ns1:ref="rulesets/basic.xml/CollapsibleIfStatements"/><ns1:rule ns1:ref="rulesets/basic.xml/UselessOverridingMethod"/><ns1:rule ns1:ref="rulesets/basic.xml/ClassCastExceptionWithToArray"/><ns1:rule ns1:ref="rulesets/basic.xml/AvoidDecimalLiteralsInBigDecimalConstructor"/><ns1:rule ns1:ref="rulesets/basic.xml/UselessOperationOnImmutable"/><ns1:rule ns1:ref="rulesets/basic.xml/MisplacedNullCheck"/><ns1:rule ns1:ref="rulesets/basic.xml/UnusedNullCheckInEquals"/><ns1:rule ns1:ref="rulesets/basic.xml/AvoidThreadGroup"/></ns1:ruleset></rulesets>
\ No newline at end of file
+<rulesets xmlns:ns1="http://castor.exolab.org/" ns1:defaultRuleSet="basic"><ns1:ruleset ns1:name="basic" ns1:language="JAVA"><ns1:description></ns1:description><ns1:rule ns1:ref="rulesets/basic.xml/EmptyCatchBlock"/><ns1:rule ns1:ref="rulesets/basic.xml/EmptyIfStmt"/><ns1:rule ns1:ref="rulesets/basic.xml/EmptyWhileStmt"/><ns1:rule ns1:ref="rulesets/basic.xml/EmptyTryBlock"/><ns1:rule ns1:ref="rulesets/basic.xml/EmptyFinallyBlock"/><ns1:rule ns1:ref="rulesets/basic.xml/EmptySwitchStatements"/><ns1:rule ns1:ref="rulesets/basic.xml/JumbledIncrementer"/><ns1:rule ns1:ref="rulesets/basic.xml/ForLoopShouldBeWhileLoop"/><ns1:rule ns1:ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/><ns1:rule ns1:ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"/><ns1:rule ns1:ref="rulesets/basic.xml/DoubleCheckedLocking"/><ns1:rule ns1:ref="rulesets/basic.xml/ReturnFromFinallyBlock"/><ns1:rule ns1:ref="rulesets/basic.xml/EmptySynchronizedBlock"/><ns1:rule ns1:ref="rulesets/basic.xml/UnnecessaryReturn"/><ns1:rule ns1:ref="rulesets/basic.xml/EmptyStaticInitializer"/><ns1:rule ns1:ref="rulesets/basic.xml/UnconditionalIfStatement"/><ns1:rule ns1:ref="rulesets/basic.xml/EmptyStatementNotInLoop"/><ns1:rule ns1:ref="rulesets/basic.xml/BooleanInstantiation"/><ns1:rule ns1:ref="rulesets/basic.xml/UnnecessaryFinalModifier"/><ns1:rule ns1:ref="rulesets/basic.xml/CollapsibleIfStatements"/><ns1:rule ns1:ref="rulesets/basic.xml/UselessOverridingMethod"/><ns1:rule ns1:ref="rulesets/basic.xml/ClassCastExceptionWithToArray"/><ns1:rule ns1:ref="rulesets/basic.xml/AvoidDecimalLiteralsInBigDecimalConstructor"/><ns1:rule ns1:ref="rulesets/basic.xml/UselessOperationOnImmutable"/><ns1:rule ns1:ref="rulesets/basic.xml/MisplacedNullCheck"/><ns1:rule ns1:ref="rulesets/basic.xml/UnusedNullCheckInEquals"/><ns1:rule ns1:ref="rulesets/basic.xml/AvoidThreadGroup"/><ns1:rule ns1:ref="rulesets/basic.xml/BrokenNullCheck"/><ns1:rule ns1:ref="rulesets/basic.xml/BigIntegerInstantiation"/><ns1:rule ns1:ref="rulesets/basic.xml/AvoidUsingOctalValues"/></ns1:ruleset></rulesets>
\ No newline at end of file
diff --git a/pmd-eclipse-ui/plugin.xml b/pmd-eclipse-ui/plugin.xml
index 58aa65c861..92d3a90673 100644
--- a/pmd-eclipse-ui/plugin.xml
+++ b/pmd-eclipse-ui/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.pmd.ui"
    name="PMD For Eclipse UI Plug-in"
-   version="1.0.2"
+   version="3.2.0"
    provider-name="PMD Development Team"
    class="net.sourceforge.pmd.ui.PMDUiPlugin">
 
diff --git a/pmd-eclipse/CHANGELOG.txt b/pmd-eclipse/CHANGELOG.txt
index 99a31f616e..a6c0300d80 100644
--- a/pmd-eclipse/CHANGELOG.txt
+++ b/pmd-eclipse/CHANGELOG.txt
@@ -2,6 +2,18 @@ Change log for the PMD Eclipse plugin
 -------------------------------------
 
 
+v3.2.0 - 15/01/2007
+
+Runtime
+-------
+. Upgrade to PMD v3.9
+. Update and improve overview and outline views
+. Refactor CPD views
+. Fix major NullPointer and ClassCastException bugs
+. Add support for JDK 6.0
+
+
+----------------------------------------------------------------------------------------
 v3.1.7 - 05/10/2006
 
 Runtime
diff --git a/pmd-eclipse/RELNOTES.txt b/pmd-eclipse/RELNOTES.txt
index 1d78c4b9cf..69699093cc 100644
--- a/pmd-eclipse/RELNOTES.txt
+++ b/pmd-eclipse/RELNOTES.txt
@@ -1,6 +1,32 @@
 Release notes for the PMD Eclipse Plugin
 ----------------------------------------
 
+v3.2.0 15/01/2006
+-----------------
+
+UPDATED : PMD v3.9
+------------------
+** JSP FILES ARE NOT SUPPORTED IN THIS VERSION YET **
+
+UPDATED : imporve overview and outline views
+--------------------------------------------
+These views include filters and the overview now propose 3 different layout of
+violations. Statistics are computed when a package is collapsed.
+A button is added to force statistics computations.
+
+NEW : Support for JDK 6.0
+-------------------------
+Projects targeted for JDK 6.0 are now supported.
+
+NEW : CPD support has been refactored
+-------------------------------------
+Dialogs and views has been developped to improve CPD integration.
+
+FIXED : various bugs...
+-----------------------
+
+
+----------------------------------------------------------------------------------------
 v3.1.7 05/10/2006
 -----------------
 
diff --git a/pmd-eclipse/plugin.xml b/pmd-eclipse/plugin.xml
index f12a9c9b56..24e3f398d1 100644
--- a/pmd-eclipse/plugin.xml
+++ b/pmd-eclipse/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.pmd.eclipse"
    name="PMD For Eclipse"
-   version="3.1.7"
+   version="3.2.0"
    provider-name="PMD Development Team">
    <requires>
       <import plugin="net.sourceforge.pmd.core"/>