diff --git a/pmd-eclipse/.classpath b/pmd-eclipse/.classpath
index c4cadeab77..e840c181f3 100644
--- a/pmd-eclipse/.classpath
+++ b/pmd-eclipse/.classpath
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="src"/>
+    <classpathentry kind="src" path="src/"/>
+    <classpathentry kind="var"
+        path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_2.0.0/resources.jar" sourcepath="_ORG_ECLIPSE_PLATFORM_SOURCE/org.eclipse.core.resources_2.0.0/resourcessrc.zip"/>
+    <classpathentry kind="var"
+        path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_2.0.0/runtime.jar" sourcepath="_ORG_ECLIPSE_PLATFORM_SOURCE/org.eclipse.core.runtime_2.0.0/runtimesrc.zip"/>
+    <classpathentry kind="var"
+        path="ECLIPSE_HOME/plugins/org.eclipse.swt.win32_2.0.0/ws/win32/swt.jar" sourcepath="_ORG_ECLIPSE_PLATFORM_WIN32_SOURCE/org.eclipse.swt.win32_2.0.0/ws/win32/swtsrc.zip"/>
+    <classpathentry kind="var"
+        path="ECLIPSE_HOME/plugins/org.eclipse.ui_2.0.0/workbench.jar" sourcepath="_ORG_ECLIPSE_PLATFORM_SOURCE/org.eclipse.ui_2.0.0/workbenchsrc.zip"/>
+    <classpathentry kind="var"
+        path="ECLIPSE_HOME/plugins/org.eclipse.ui.win32_2.0.0/workbenchwin32.jar" sourcepath="_ORG_ECLIPSE_PLATFORM_WIN32_SOURCE/org.eclipse.ui.win32_2.0.0/workbenchwin32src.zip"/>
+    <classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.3/xmlParserAPIs.jar"/>
+    <classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.3/xercesImpl.jar"/>
     <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="lib" path="C:/eclipse/plugins/org.eclipse.core.runtime_2.0.0/runtime.jar"/>
-    <classpathentry kind="lib" path="C:/eclipse/plugins/org.eclipse.pde.core_2.0.0/pdecore.jar"/>
-    <classpathentry kind="lib" path="C:/eclipse/plugins/org.eclipse.swt.win32_2.0.0/ws/win32/swt.jar"/>
-    <classpathentry kind="lib" path="C:/eclipse/plugins/org.eclipse.ui_2.0.0/workbench.jar"/>
-    <classpathentry kind="lib" path="C:/eclipse/plugins/org.eclipse.ui.win32_2.0.0/workbenchwin32.jar"/>
-    <classpathentry kind="lib" path="C:/eclipse/plugins/org.eclipse.core.resources_2.0.0/resources.jar"/>
-    <classpathentry kind="lib" path="C:/eclipse/workspace/pmd-eclipse/lib/pmd-0.8.jar"/>
+    <classpathentry kind="src" path="/pmd"/>
     <classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/pmd-eclipse/.project b/pmd-eclipse/.project
index 52aa74be89..80360c1d35 100644
--- a/pmd-eclipse/.project
+++ b/pmd-eclipse/.project
@@ -3,6 +3,7 @@
 	<name>pmd-eclipse</name>
 	<comment></comment>
 	<projects>
+		<project>pmd</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/pmd-eclipse/plugin.xml b/pmd-eclipse/plugin.xml
index b138fbf61a..deb248cbb8 100644
--- a/pmd-eclipse/plugin.xml
+++ b/pmd-eclipse/plugin.xml
@@ -14,6 +14,8 @@
    </runtime>
    <requires>
       <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.swt"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.apache.xerces"/>
    </requires>