diff --git a/pmd-java8/pom.xml b/pmd-java8/pom.xml
index 89cdcc553e..1fc2151c74 100644
--- a/pmd-java8/pom.xml
+++ b/pmd-java8/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
-        <version>5.3.5-SNAPSHOT</version>
+        <version>5.3.6-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/src/site/markdown/overview/changelog-old.md b/src/site/markdown/overview/changelog-old.md
index b57c81f344..07a0782762 100644
--- a/src/site/markdown/overview/changelog-old.md
+++ b/src/site/markdown/overview/changelog-old.md
@@ -4,6 +4,34 @@ Previous versions of PMD can be downloaded here:
 http://sourceforge.net/projects/pmd/files/pmd/
 
 
+## 04-October-2015 - 5.3.5
+
+**Modified Rules:**
+
+*   java-design/CloseResource: New Property *closeAsDefaultTarget* which is *true* by default to stay
+    backwards compatible. If this property is *true*, the rule will make sure, that `close` itself is
+    always considered as a *closeTarget* - no matter whether it is configured with the *closeTargets* property
+    or not.
+
+**Pull Requests:**
+
+*   [#71](https://github.com/pmd/pmd/pull/71): #1410 Improve description of DefaultPackage rule
+
+**Bugfixes:**
+
+*   java-controversial/DefaultPackage:
+    *   [#1410](https://sourceforge.net/p/pmd/bugs/1410/): DefaultPackage triggers on field annotated with @VisibleForTesting
+*   java-design/CloseResource:
+    *   [#1387](https://sourceforge.net/p/pmd/bugs/1387/): CloseResource has false positive for ResultSet
+*   java-optimizations/RedundantFieldInitializer
+    *   [#1418](https://sourceforge.net/p/pmd/bugs/1418/): RedundantFieldInitializer false positive with large long value
+*   java-strings/InsufficientStringBufferDeclaration:
+    *   [#1409](https://sourceforge.net/p/pmd/bugs/1409/): NullPointerException in InsufficientStringBufferRule
+    *   [#1413](https://sourceforge.net/p/pmd/bugs/1413/): False positive StringBuffer constructor with ?: int value
+*   java-unnecessary/UselessParentheses:
+    *   [#1407](https://sourceforge.net/p/pmd/bugs/1407/): UselessParentheses "&" and "+" operator precedence
+
+
 ## 18-September-2015 - 5.3.4
 
 **Bugfixes:**
diff --git a/src/site/markdown/overview/changelog.md b/src/site/markdown/overview/changelog.md
index d9013de21a..6722b0f59e 100644
--- a/src/site/markdown/overview/changelog.md
+++ b/src/site/markdown/overview/changelog.md
@@ -1,29 +1,15 @@
 # Changelog
 
-## 04-October-2015 - 5.3.5
+## ????? - 5.3.6-SNAPSHOT
 
-**Modified Rules:**
+**New Supported Languages:**
 
-*   java-design/CloseResource: New Property *closeAsDefaultTarget* which is *true* by default to stay
-    backwards compatible. If this property is *true*, the rule will make sure, that `close` itself is
-    always considered as a *closeTarget* - no matter whether it is configured with the *closeTargets* property
-    or not.
+**Feature Request and Improvements:**
+
+**New/Modified/Deprecated Rules:**
 
 **Pull Requests:**
 
-*   [#71](https://github.com/pmd/pmd/pull/71): #1410 Improve description of DefaultPackage rule
-
 **Bugfixes:**
 
-*   java-controversial/DefaultPackage:
-    *   [#1410](https://sourceforge.net/p/pmd/bugs/1410/): DefaultPackage triggers on field annotated with @VisibleForTesting
-*   java-design/CloseResource:
-    *   [#1387](https://sourceforge.net/p/pmd/bugs/1387/): CloseResource has false positive for ResultSet
-*   java-optimizations/RedundantFieldInitializer
-    *   [#1418](https://sourceforge.net/p/pmd/bugs/1418/): RedundantFieldInitializer false positive with large long value
-*   java-strings/InsufficientStringBufferDeclaration:
-    *   [#1409](https://sourceforge.net/p/pmd/bugs/1409/): NullPointerException in InsufficientStringBufferRule
-    *   [#1413](https://sourceforge.net/p/pmd/bugs/1413/): False positive StringBuffer constructor with ?: int value
-*   java-unnecessary/UselessParentheses:
-    *   [#1407](https://sourceforge.net/p/pmd/bugs/1407/): UselessParentheses "&" and "+" operator precedence
-
+**API Changes:**