diff --git a/src/site/markdown/overview/changelog-old.md b/src/site/markdown/overview/changelog-old.md
index b71aab0f40..3f0d0c55b9 100644
--- a/src/site/markdown/overview/changelog-old.md
+++ b/src/site/markdown/overview/changelog-old.md
@@ -3,6 +3,28 @@
 Previous versions of PMD can be downloaded here:
 http://sourceforge.net/projects/pmd/files/pmd/
 
+
+## 27-July-2016 - 5.5.1
+
+**Pull Requests:**
+
+*   [#101](https://github.com/pmd/pmd/pull/101): \[java] Improve multithreading performance: do not lock on classloader
+*   [#102](https://github.com/pmd/pmd/pull/102): \[apex] Restrict AvoidLogicInTrigger rule to max. 1 violation per file
+*   [#103](https://github.com/pmd/pmd/pull/103): \[java] \[apex] Fix for 1501: CyclomaticComplexity rule causes OOM when class reporting is disabled
+*   [#104](https://github.com/pmd/pmd/pull/104): \[core] \[java] Close opened file handles
+*   [apex #43](https://github.com/Up2Go/pmd/pull/43): \[apex] Basic apex unit test rules
+
+**Bugfixes:**
+
+*   Apex
+    *   [#1501](https://sourceforge.net/p/pmd/bugs/1501/): \[java] \[apex] CyclomaticComplexity rule causes OOM when class reporting is disabled
+*   Java
+    *   [#1501](https://sourceforge.net/p/pmd/bugs/1501/): \[java] \[apex] CyclomaticComplexity rule causes OOM when class reporting is disabled
+*   General
+    *   [#1499](https://sourceforge.net/p/pmd/bugs/1499/): \[core] CPD test break PMD 5.5.1 build on Windows
+    *   [#1508](https://sourceforge.net/p/pmd/bugs/1508/): \[core] \[java] PMD is leaking file handles
+
+
 ## 25-June-2016 - 5.5.0
 
 **System requirements:**
diff --git a/src/site/markdown/overview/changelog.md b/src/site/markdown/overview/changelog.md
index 634c71bc08..ae2c6a9168 100644
--- a/src/site/markdown/overview/changelog.md
+++ b/src/site/markdown/overview/changelog.md
@@ -1,21 +1,15 @@
 # Changelog
 
-## 27-July-2016 - 5.5.1
+## ????? - 5.5.2-SNAPSHOT
+
+**New Supported Languages:**
+
+**Feature Request and Improvements:**
+
+**New/Modified/Deprecated Rules:**
 
 **Pull Requests:**
 
-*   [#101](https://github.com/pmd/pmd/pull/101): \[java] Improve multithreading performance: do not lock on classloader
-*   [#102](https://github.com/pmd/pmd/pull/102): \[apex] Restrict AvoidLogicInTrigger rule to max. 1 violation per file
-*   [#103](https://github.com/pmd/pmd/pull/103): \[java] \[apex] Fix for 1501: CyclomaticComplexity rule causes OOM when class reporting is disabled
-*   [#104](https://github.com/pmd/pmd/pull/104): \[core] \[java] Close opened file handles
-*   [apex #43](https://github.com/Up2Go/pmd/pull/43): \[apex] Basic apex unit test rules
-
 **Bugfixes:**
 
-*   Apex
-    *   [#1501](https://sourceforge.net/p/pmd/bugs/1501/): \[java] \[apex] CyclomaticComplexity rule causes OOM when class reporting is disabled
-*   Java
-    *   [#1501](https://sourceforge.net/p/pmd/bugs/1501/): \[java] \[apex] CyclomaticComplexity rule causes OOM when class reporting is disabled
-*   General
-    *   [#1499](https://sourceforge.net/p/pmd/bugs/1499/): \[core] CPD test break PMD 5.5.1 build on Windows
-    *   [#1508](https://sourceforge.net/p/pmd/bugs/1508/): \[core] \[java] PMD is leaking file handles
+**API Changes:**