diff --git a/pmd-eclipse-feature/feature.xml b/pmd-eclipse-feature/feature.xml
index 52d2c6d96c..d0d1b2be74 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="2.0.5.v3"
+      version="2.1.0.v3"
       provider-name="%feature.provider_name"
       image="pmd_logo_small.jpg">
 
@@ -35,12 +35,18 @@
          id="net.sourceforge.pmd.core"
          download-size="0"
          install-size="0"
-         version="1.8.0.v3"/>
+         version="2.0.1.v3"/>
 
    <plugin
          id="net.sourceforge.pmd.eclipse"
          download-size="0"
          install-size="0"
-         version="2.0.5.v3"/>
+         version="2.1.0.v3"/>
+
+   <plugin
+         id="org.apache.xerces"
+         download-size="0"
+         install-size="0"
+         version="2.6.2"/>
 
 </feature>
diff --git a/pmd-eclipse-pmd/.classpath b/pmd-eclipse-pmd/.classpath
index 1a47c67cf4..f0c4a37051 100644
--- a/pmd-eclipse-pmd/.classpath
+++ b/pmd-eclipse-pmd/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry exported="true" kind="lib" path="lib/jaxen-core-1.0-fcs.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/saxpath-1.0-fcs.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/pmd-1.9.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/pmd-2.0.jar"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
diff --git a/pmd-eclipse-pmd/lib/pmd-1.9.jar b/pmd-eclipse-pmd/lib/pmd-1.9.jar
deleted file mode 100644
index 9e841adb49..0000000000
Binary files a/pmd-eclipse-pmd/lib/pmd-1.9.jar and /dev/null differ
diff --git a/pmd-eclipse-pmd/plugin.xml b/pmd-eclipse-pmd/plugin.xml
index a592ffa34b..c3ae43f2e2 100644
--- a/pmd-eclipse-pmd/plugin.xml
+++ b/pmd-eclipse-pmd/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.pmd.core"
    name="%plugin.name"
-   version="1.9.0.v3"
+   version="2.0.1.v3"
    provider-name="%plugin.provider">
 
    <runtime>
@@ -13,7 +13,7 @@
       <library name="lib/saxpath-1.0-fcs.jar">
          <export name="*"/>
       </library>
-      <library name="lib/pmd-1.9.jar">
+      <library name="lib/pmd-2.0.jar">
          <export name="*"/>
       </library>
    </runtime>
diff --git a/pmd-eclipse/.classpath b/pmd-eclipse/.classpath
index 4f1a2e99ac..1da6ae94bd 100644
--- a/pmd-eclipse/.classpath
+++ b/pmd-eclipse/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="lib" path="lib/log4j-1.2.8.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging.jar"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
diff --git a/pmd-eclipse/.cvsignore b/pmd-eclipse/.cvsignore
index 3bde7de5a7..a1086e3c44 100644
--- a/pmd-eclipse/.cvsignore
+++ b/pmd-eclipse/.cvsignore
@@ -1,2 +1,3 @@
 pmd-eclipse.jar
 pmd-eclipse-*.zip
+refactoring
diff --git a/pmd-eclipse/CHANGELOG.txt b/pmd-eclipse/CHANGELOG.txt
index afd0211392..c275197007 100644
--- a/pmd-eclipse/CHANGELOG.txt
+++ b/pmd-eclipse/CHANGELOG.txt
@@ -2,6 +2,42 @@ Change log for the PMD Eclipse plugin
 -------------------------------------
 
 
+
+v2.0.7 - xx/xx/2004
+
+Runtime
+-------
+. update to PMD v2.0
+. update the icons (thanks to Ebu)
+. fix error in the fragment how to
+
+Development
+-----------
+. begin the refactoring; apply MVC to GUIs; apply Command and CommandProcessor
+  patterns for PMD and Eclipse resources operations.
+. Before generalizing the refactoring, test on the property page.
+
+
+----------------------------------------------------------------------------------------
+v2.0.6 - xx/07/2004
+
+Runtime
+-------
+. fix DOMSerializer class not found.
+  -> Package Xerces as an Eclipse feature because SUN JDK 1.4 packages an incomplete
+     Xerces implementation
+
+
+----------------------------------------------------------------------------------------
+v2.0.5 - 30/06/2004
+
+Runtime
+-------
+. Upgrading to PMD v1.8
+
+
+
+----------------------------------------------------------------------------------------
 v2.0.4 - 29/04/2004
 
 Runtime
diff --git a/pmd-eclipse/TODO.txt b/pmd-eclipse/TODO.txt
index 7ca3c21896..65c5ba7361 100644
--- a/pmd-eclipse/TODO.txt
+++ b/pmd-eclipse/TODO.txt
@@ -1,3 +1,7 @@
 Plans
 -----
 - improving CPD support (develop a cpd view for cpd reports)
+- checking files only under project source directories
+- provide a multiline editor to modify rules properties
+- force user to enter comments when reviewing a violation
+
diff --git a/pmd-eclipse/plugin.xml b/pmd-eclipse/plugin.xml
index 63fcedaca3..1f1d86790f 100644
--- a/pmd-eclipse/plugin.xml
+++ b/pmd-eclipse/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.pmd.eclipse"
    name="%plugin.name"
-   version="2.0.5.v3"
+   version="2.1.0.v3"
    provider-name="%plugin.provider"
    class="net.sourceforge.pmd.eclipse.PMDPlugin">
 
@@ -24,8 +24,9 @@
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.swt"/>
       <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="net.sourceforge.pmd.core"/>
       <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.apache.xerces"/>
+      <import plugin="net.sourceforge.pmd.core"/>
    </requires>