diff --git a/src/site/markdown/overview/changelog-old.md b/src/site/markdown/overview/changelog-old.md
index eb065cc81e..60f8c633db 100644
--- a/src/site/markdown/overview/changelog-old.md
+++ b/src/site/markdown/overview/changelog-old.md
@@ -4,6 +4,35 @@ Previous versions of PMD can be downloaded here:
 http://sourceforge.net/projects/pmd/files/pmd/
 
 
+## 01-July-2017 - 5.8.1
+
+The PMD team is pleased to announce PMD 5.8.1.
+
+This is a bug fixing release.
+
+### Table Of Contents
+
+* [Fixed Issues](#Fixed_Issues)
+* [API Changes](#API_Changes)
+* [External Contributions](#External_Contributions)
+
+### Fixed Issues
+
+*   java
+    *   [#471](https://github.com/pmd/pmd/issues/471): \[java] Error while processing class when EnumMap is used in PMD 5.8.0
+    *   [#477](https://github.com/pmd/pmd/issues/477): \[core] NoClassDefFoundError under 5.8
+    *   [#478](https://github.com/pmd/pmd/issues/478): \[core] Processing issues dealing with anonymous classes
+
+### API Changes
+
+*   The `getGenericArgs()` method introduced to `TypeNode` in 5.8.0 was removed. You can access to generics' info through the `JavaTypeDefinition` object.
+*   The `JavaTypeDefinitionBuilder` class introduced in 5.8.0 is not more. You can use factory methods available on `JavaTypeDefinition`
+
+### External Contributions
+
+*   [#472](https://github.com/pmd/pmd/pull/472): \[java] fix error with raw types, bug #471
+
+
 ## 24-June-2017 - 5.8.0
 
 The PMD team is pleased to announce PMD 5.8.0.
diff --git a/src/site/markdown/overview/changelog.md b/src/site/markdown/overview/changelog.md
index b63bfdcc09..bedb8fd2e0 100644
--- a/src/site/markdown/overview/changelog.md
+++ b/src/site/markdown/overview/changelog.md
@@ -1,29 +1,23 @@
 # PMD Release Notes
 
-## 01-July-2017 - 5.8.1
+## ????? - 5.8.2-SNAPSHOT
 
-The PMD team is pleased to announce PMD 5.8.1.
+The PMD team is pleased to announce PMD 5.8.2.
 
 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)
 
-### Fixed Issues
+### New and noteworthy
 
-*   java
-    *   [#471](https://github.com/pmd/pmd/issues/471): \[java] Error while processing class when EnumMap is used in PMD 5.8.0
-    *   [#477](https://github.com/pmd/pmd/issues/477): \[core] NoClassDefFoundError under 5.8
-    *   [#478](https://github.com/pmd/pmd/issues/478): \[core] Processing issues dealing with anonymous classes
+### Fixed Issues
 
 ### API Changes
 
-*   The `getGenericArgs()` method introduced to `TypeNode` in 5.8.0 was removed. You can access to generics' info through the `JavaTypeDefinition` object.
-*   The `JavaTypeDefinitionBuilder` class introduced in 5.8.0 is not more. You can use factory methods available on `JavaTypeDefinition`
-
 ### External Contributions
 
-*   [#472](https://github.com/pmd/pmd/pull/472): \[java] fix error with raw types, bug #471