diff --git a/src/site/markdown/overview/changelog-old.md b/src/site/markdown/overview/changelog-old.md
index 77314be194..c8341dfc64 100644
--- a/src/site/markdown/overview/changelog-old.md
+++ b/src/site/markdown/overview/changelog-old.md
@@ -4,6 +4,18 @@ Previous versions of PMD can be downloaded here:
 http://sourceforge.net/projects/pmd/files/pmd/
 
 
+## 29-April-2017 - 5.5.7
+
+The PMD team is pleased to announce PMD 5.5.7.
+
+This is a bug fixing release.
+
+### Fixed Issues
+
+*   General
+    *   [#364](https://github.com/pmd/pmd/issues/364): \[core] Stream closed exception when running through maven
+
+
 ## 19-April-2017 - 5.5.6
 
 The PMD team is pleased to announce PMD 5.5.6.
diff --git a/src/site/markdown/overview/changelog.md b/src/site/markdown/overview/changelog.md
index 780e68845e..197a0a43e4 100644
--- a/src/site/markdown/overview/changelog.md
+++ b/src/site/markdown/overview/changelog.md
@@ -1,13 +1,22 @@
 # PMD Release Notes
 
-## 29-April-2017 - 5.5.7
+## ????? - 5.5.8-SNAPSHOT
 
-The PMD team is pleased to announce PMD 5.5.7.
+The PMD team is pleased to announce PMD 5.5.8.
 
 This is a bug fixing release.
 
+### Table Of Contents
+
+* [New and noteworthy](#New_and_noteworthy)
+* [Fixed Issues](#Fixed_Issues)
+* [API Changes](#API_Changes)
+* [External Contributions](#External_Contributions)
+
+### New and noteworthy
+
 ### Fixed Issues
 
-*   General
-    *   [#364](https://github.com/pmd/pmd/issues/364): \[core] Stream closed exception when running through maven
+### API Changes
 
+### External Contributions