diff --git a/pmd-eclipse-feature/feature.xml b/pmd-eclipse-feature/feature.xml
index 3293747ad0..b43018aa59 100644
--- a/pmd-eclipse-feature/feature.xml
+++ b/pmd-eclipse-feature/feature.xml
@@ -35,24 +35,24 @@
          id="net.sourceforge.pmd.eclipse"
          download-size="0"
          install-size="0"
-         version="3.1.6"/>
+         version="3.1.7"/>
 
    <plugin
          id="net.sourceforge.pmd.ui"
          download-size="0"
          install-size="0"
-         version="1.0.1"/>
+         version="1.0.2"/>
 
    <plugin
          id="net.sourceforge.pmd.runtime"
          download-size="0"
          install-size="0"
-         version="1.0.2"/>
+         version="1.0.3"/>
 
    <plugin
          id="net.sourceforge.pmd.core"
          download-size="0"
          install-size="0"
-         version="3.7.1"/>
+         version="3.8.0"/>
 
 </feature>
diff --git a/pmd-eclipse-pmd/plugin.xml b/pmd-eclipse-pmd/plugin.xml
index 00cca242f6..1b6e4f4855 100644
--- a/pmd-eclipse-pmd/plugin.xml
+++ b/pmd-eclipse-pmd/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.pmd.core"
    name="PMD For Eclipse Core Plug-in"
-   version="3.8"
+   version="3.8.0"
    provider-name="PMD Development Team"
    class="net.sourceforge.pmd.core.PMDCorePlugin">
 
diff --git a/pmd-eclipse-runtime/plugin.xml b/pmd-eclipse-runtime/plugin.xml
index 0b613f7e50..1d1604bb1d 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.2"
+   version="1.0.3"
    provider-name="PMD Development Team"
    class="net.sourceforge.pmd.runtime.PMDRuntimePlugin">
 
diff --git a/pmd-eclipse-ui/nl/fr/messages.properties b/pmd-eclipse-ui/nl/fr/messages.properties
index 2f5bc3bd56..f0b92af290 100644
--- a/pmd-eclipse-ui/nl/fr/messages.properties
+++ b/pmd-eclipse-ui/nl/fr/messages.properties
@@ -11,6 +11,7 @@ property.button.store_ruleset_project = Utiliser l'ensemble de r
 property.button.include_derived_files = Inclure les fichiers dérivés
 
 # General preferences page
+preference.pmd.header = Préférences Générales PMD
 preference.pmd.title = Préférences Générales PMD
 preference.pmd.label.addcomment = Texte additionnel pour les commentaires de revue :
 preference.pmd.label.sample = Exemple :
diff --git a/pmd-eclipse-ui/plugin.xml b/pmd-eclipse-ui/plugin.xml
index 885ddd1850..7219ca2f75 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.1"
+   version="1.0.2"
    provider-name="PMD Development Team"
    class="net.sourceforge.pmd.ui.PMDUiPlugin">
 
@@ -275,13 +275,6 @@
             name="%view.category"
             id="net.sourceforge.pmd.ui.views">
       </category>
-      <view
-            allowMultiple="false"
-            name="%view.violation"
-            icon="icons/pmd-icon-16.gif"
-            category="net.sourceforge.pmd.ui.views"
-            class="net.sourceforge.pmd.ui.views.legacy.ViolationView"
-            id="net.sourceforge.pmd.ui.views.legacy.ViolationView"/>
       <view
             allowMultiple="false"
             icon="icons/icon_outline.gif"
diff --git a/pmd-eclipse/CHANGELOG.txt b/pmd-eclipse/CHANGELOG.txt
index 4c97c95be4..99a31f616e 100644
--- a/pmd-eclipse/CHANGELOG.txt
+++ b/pmd-eclipse/CHANGELOG.txt
@@ -2,7 +2,24 @@ Change log for the PMD Eclipse plugin
 -------------------------------------
 
 
-v3.1.6 - 09/04/2006
+v3.1.7 - 05/10/2006
+
+Runtime
+-------
+. Upgrade to PMD v3.8
+. Fix NPE when searching for quickfixes for rules from project rulesets
+. Fix 1541795 (at least it should)
+. Fix 1554639 (thanks to Sven Jacob)
+. Fix the refreshproblem of the dataflowanomalytable and a bug with overloaded methods in the dataflowview (Thanks to Sven Jacob)
+. Fix 1417291 CCE when adding report (eclipse)
+. Fix 1470054 Violation Details dlg has OK button which does nothing
+. Fix 1470080 NPE in PMDRecord.findResource
+. Fix 1481300 plugin throws NPE after move prjs to new workspace
+. Fix 1486390 Exception during execution
+
+
+----------------------------------------------------------------------------------------
+v3.1.6 - 09/06/2006
 
 Runtime
 -------
diff --git a/pmd-eclipse/CREDITS.txt b/pmd-eclipse/CREDITS.txt
index 1358d600de..7ac605c72f 100644
--- a/pmd-eclipse/CREDITS.txt
+++ b/pmd-eclipse/CREDITS.txt
@@ -8,6 +8,7 @@ Chris Grindstaff             fix SWTException when PMD is run on a file with syn
 Brian Remedios               improvements in the PMDPlugin class
                              preferences rule table have sortable columns
 Pablo Alba                   enhancements to the Violations View (legacy)
+Sven Jacob                   bug fixes
 
 ------------------------------------------
 *** SPECIAL THANKS TO SEBASTIAN RAFFEL ***
diff --git a/pmd-eclipse/RELNOTES.txt b/pmd-eclipse/RELNOTES.txt
index 224cadb0b1..1d78c4b9cf 100644
--- a/pmd-eclipse/RELNOTES.txt
+++ b/pmd-eclipse/RELNOTES.txt
@@ -1,6 +1,18 @@
 Release notes for the PMD Eclipse Plugin
 ----------------------------------------
 
+v3.1.7 05/10/2006
+-----------------
+
+UPDATED : PMD v3.8
+------------------
+** JSP FILES ARE NOT SUPPORTED IN THIS VERSION YET **
+
+FIXED : various bugs...
+-----------------------
+
+
+----------------------------------------------------------------------------------------
 v3.1.6 09/06/2006
 -----------------
 
diff --git a/pmd-eclipse/plugin.xml b/pmd-eclipse/plugin.xml
index 2e49c0e8f2..f12a9c9b56 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.6"
+   version="3.1.7"
    provider-name="PMD Development Team">
    <requires>
       <import plugin="net.sourceforge.pmd.core"/>