diff --git a/pmd-netbeans/CHANGES.txt b/pmd-netbeans/CHANGES.txt
index ae359ea522..235bcdd486 100644
--- a/pmd-netbeans/CHANGES.txt
+++ b/pmd-netbeans/CHANGES.txt
@@ -1,3 +1,8 @@
+Version 2.2.5
+- Updated pmd to version 4.2.5
+- Fixed dependencies to make it working with nightly NetBeans builds (post 6.5)
+- Requires NetBeans 6.5 or newer IDE build
+
 Version 2.2.1
 - Updated pmd to version 4.2.1
 
diff --git a/pmd-netbeans/build.xml b/pmd-netbeans/build.xml
index 45f7c62adc..392fadf328 100644
--- a/pmd-netbeans/build.xml
+++ b/pmd-netbeans/build.xml
@@ -2,9 +2,9 @@
 
     <import file="nbproject/build-impl.xml"/>
 
-    <property name="pmd.jar" value="pmd-4.2.1.jar"/>
-    <property name="nb.version" value="netbeans60"/>
-    <property name="VERSION" value="2.3"/>
+    <property name="pmd.jar" value="pmd-4.2.5.jar"/>
+    <property name="nb.version" value="netbeans65"/>
+    <property name="VERSION" value="2.2.5"/>
 
     <property file="build.ant.properties"/>
 
diff --git a/pmd-netbeans/lib/pmd-4.2.1.jar b/pmd-netbeans/lib/pmd-4.2.5.jar
similarity index 64%
rename from pmd-netbeans/lib/pmd-4.2.1.jar
rename to pmd-netbeans/lib/pmd-4.2.5.jar
index 9ad00d60ae..986ad20105 100644
Binary files a/pmd-netbeans/lib/pmd-4.2.1.jar and b/pmd-netbeans/lib/pmd-4.2.5.jar differ
diff --git a/pmd-netbeans/manifest.mf b/pmd-netbeans/manifest.mf
index 325bb9ffd4..ef989cc950 100644
--- a/pmd-netbeans/manifest.mf
+++ b/pmd-netbeans/manifest.mf
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-OpenIDE-Module-Specification-Version: 2.3
+OpenIDE-Module-Specification-Version: 2.2.5
 Created-By: Ole-Martin Mørk and Gunnlaugur Þór Briem, Radim Kubacki, Tomasz Slota
 OpenIDE-Module: pmd
 OpenIDE-Module-Layer: pmd/mf-layer.xml
diff --git a/pmd-netbeans/nbproject/genfiles.properties b/pmd-netbeans/nbproject/genfiles.properties
index 5d76e43c46..d2e5fe268c 100644
--- a/pmd-netbeans/nbproject/genfiles.properties
+++ b/pmd-netbeans/nbproject/genfiles.properties
@@ -1,5 +1,5 @@
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=cf046e38
+nbproject/build-impl.xml.data.CRC32=192e97a1
 nbproject/build-impl.xml.script.CRC32=209b78c0
 nbproject/build-impl.xml.stylesheet.CRC32=deb65f65
diff --git a/pmd-netbeans/nbproject/project.properties b/pmd-netbeans/nbproject/project.properties
index a9d9b70596..c3daeff34e 100644
--- a/pmd-netbeans/nbproject/project.properties
+++ b/pmd-netbeans/nbproject/project.properties
@@ -1,6 +1,6 @@
 extra.module.files=\
   modules/ext/jaxen-1.1.1.jar \
-  modules/ext/pmd-4.2.1.jar \
+  modules/ext/pmd-4.2.5.jar \
   modules/ext/asm-3.1.jar \
   modules/ext/nbpmdrules.jar 
 javac.compilerargs=-Xlint:unchecked
diff --git a/pmd-netbeans/nbproject/project.xml b/pmd-netbeans/nbproject/project.xml
index 0d13860ee7..f00d00fded 100644
--- a/pmd-netbeans/nbproject/project.xml
+++ b/pmd-netbeans/nbproject/project.xml
@@ -208,8 +208,8 @@
                 <binary-origin>lib/jaxen-1.1.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/pmd-4.2.1.jar</runtime-relative-path>
-                <binary-origin>lib/pmd-4.2.1.jar</binary-origin>
+                <runtime-relative-path>ext/pmd-4.2.5.jar</runtime-relative-path>
+                <binary-origin>lib/pmd-4.2.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <!-- Deployed path, relative to dir containing module: -->
@@ -217,7 +217,7 @@
             </class-path-extension>
             <extra-compilation-unit>
                 <package-root>libsrc</package-root>
-                <classpath>lib/pmd-4.2.1.jar</classpath>
+                <classpath>lib/pmd-4.2.5.jar</classpath>
                 <built-to>build/libclasses</built-to>
                 <built-to>${cluster}/modules/ext/nbpmdrules.jar</built-to>
             </extra-compilation-unit>
diff --git a/pmd-netbeans/src/pmd/mf-layer.xml b/pmd-netbeans/src/pmd/mf-layer.xml
index a96fc1b602..f1797f5a1f 100644
--- a/pmd-netbeans/src/pmd/mf-layer.xml
+++ b/pmd-netbeans/src/pmd/mf-layer.xml
@@ -3,24 +3,26 @@
 <filesystem>
   <folder name="OptionsDialog">
      <folder name="Advanced">
-         <attr name="FormEditor.instance/PmdOptionsPanel.instance" boolvalue="true"/>
-            <file name="PmdOptionsPanel.instance">
+         <file name="PmdOptionsPanel.instance">
              <attr name="instanceClass" stringvalue="pmd.config.ui.PmdOptionsPanel"/>
          </file>
      </folder>
   </folder>
   <folder name="Services">
     <folder name="JavaHelp">
-      <file name="pmd-helpset.xml" url="pmd-helpset.xml"/>
+      <file name="pmd-helpset.xml" url="pmd-helpset.xml">
+         <attr name="position" intvalue="4000"/>
+      </file>
     </folder>
   </folder>
     <folder name="Menu">
         <folder name="Window">
-            <attr name="ResultWindowOpenAction.shadow/pmd-ShowOutputWindowAction.shadow" boolvalue="true"/>
-            <file name="pmd-ShowOutputWindowAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/Window/pmd-ShowOutputWindowAction.instance"/>
-            </file>
-            <attr name="pmd-ShowOutputWindowAction.shadow/Debug" boolvalue="true"/>
+            <folder name="Output">
+                <file name="pmd-ShowOutputWindowAction.shadow">
+                    <attr name="originalFile" stringvalue="Actions/Window/pmd-ShowOutputWindowAction.instance"/>
+                    <attr name="position" intvalue="600"/>
+                </file>
+            </folder>
         </folder>
     </folder>
     <folder name="Actions">