diff --git a/src/site/markdown/overview/changelog-old.md b/src/site/markdown/overview/changelog-old.md
index 2f793c4203..2b39ab88e6 100644
--- a/src/site/markdown/overview/changelog-old.md
+++ b/src/site/markdown/overview/changelog-old.md
@@ -4,6 +4,67 @@ Previous versions of PMD can be downloaded here:
http://sourceforge.net/projects/pmd/files/pmd/
+## 04-November-2016 - 5.3.8
+
+**Summary**
+
+* 1 feature requests
+* 6 pull requests
+* 17 bug fixes
+
+**Feature Requests and Improvements:**
+
+* [#1360](https://sourceforge.net/p/pmd/bugs/1360/): \[core] \[java] Provide backwards compatibility for PMD configuration file
+
+**Pull Requests:**
+
+* [#35](https://github.com/adangel/pmd/pull/35): \[javascript] Javascript tokenizer now ignores comment tokens.
+* [#103](https://github.com/pmd/pmd/pull/103): \[java] Fix for 1501: CyclomaticComplexity rule causes OOM when class reporting is disabled
+* [#111](https://github.com/pmd/pmd/pull/111): \[java] Fix BooleanInstantiationRule for Java 8
+* [#112](https://github.com/pmd/pmd/pull/112): \[java] Fix ClassCastException on CloneMethodMustImplementCloneable
+* [#113](https://github.com/pmd/pmd/pull/113): \[java] Fix ClassCastException on SignatureDeclareThrowsException
+* [#119](https://github.com/pmd/pmd/pull/119): \[plsql] Fix PMD issue 1531- endless loop followed by OOM while parsing (PL)SQL
+
+**Bugfixes:**
+
+* java
+ * [#1501](https://sourceforge.net/p/pmd/bugs/1501/): \[java] \[apex] CyclomaticComplexity rule causes OOM when class reporting is disabled
+* java-basic/BooleanInstantiation
+ * [#1533](https://sourceforge.net/p/pmd/bugs/1533/): \[java] BooleanInstantiation: ClassCastException with Annotation
+* java-comments
+ * [#1522](https://sourceforge.net/p/pmd/bugs/1522/): \[java] CommentRequired: false positive
+* java-design/CloseResource
+ * [#1479](https://sourceforge.net/p/pmd/bugs/1479/): \[java] CloseResource: false positive on Statement
+* java-imports/UnusedImports
+ * [#1529](https://sourceforge.net/p/pmd/bugs/1529/): \[java] UnusedImports: The created rule violation has no class name
+* java-typeresolution/CloneMethodMustImplementCloneable
+ * [#1532](https://sourceforge.net/p/pmd/bugs/1532/): \[java] CloneMethodMustImplementCloneable: Implemented Interface extends Cloneable
+ * [#1534](https://sourceforge.net/p/pmd/bugs/1534/): \[java] CloneMethodMustImplementCloneable: ClassCastException with Annotation (java8)
+* java-typeresolution/SignatureDeclareThrowsException
+ * [#1535](https://sourceforge.net/p/pmd/bugs/1535/): \[java] SignatureDeclareThrowsException: ClassCastException with Annotation
+* java-unusedcode/UnusedLocalVariable
+ * [#1484](https://sourceforge.net/p/pmd/bugs/1484/): \[java] UnusedLocalVariable: false positive - parenthesis
+* java-unusedcode/UnusedModifier
+ * [#1480](https://sourceforge.net/p/pmd/bugs/1480/): \[java] UnusedModifier: false positive on public modifier used with inner interface in enum
+* plsql
+ * [#1520](https://sourceforge.net/p/pmd/bugs/1520/): \[plsql] Missing PL/SQL language constructs in parser: Is Of Type, Using
+ * [#1527](https://sourceforge.net/p/pmd/bugs/1527/): \[plsql] PRAGMA AUTONOMOUS_TRANSACTION gives processing errors
+ * [#1531](https://sourceforge.net/p/pmd/bugs/1531/): \[plsql] OOM/Endless loop while parsing (PL)SQL
+* General
+ * [#1481](https://sourceforge.net/p/pmd/bugs/1481/): \[core] CPD: no problems found results in blank file instead of empty xml
+ * [#1499](https://sourceforge.net/p/pmd/bugs/1499/): \[core] CPD test break PMD 5.5.1 build on Windows
+ * [#1506](https://sourceforge.net/p/pmd/bugs/1506/): \[core] When runing any RuleTst, start/end methods not called
+ * [#1508](https://sourceforge.net/p/pmd/bugs/1508/): \[core] \[java] PMD is leaking file handles
+
+**API Changes:**
+
+* New command line parameter for PMD: `-norulesetcompatibility` - this disables the ruleset factory
+ compatibility filter and fails, if e.g. an old rule name is used in the ruleset.
+ See also [#1360](https://sourceforge.net/p/pmd/bugs/1360/).
+ This option is also available for the ant task: `true`.
+* CPD: If no problems found, an empty report will be output instead of nothing. See also [#1481](https://sourceforge.net/p/pmd/bugs/1481/)
+
+
## 30-April-2016 - 5.3.7
**New Supported Languages:**
diff --git a/src/site/markdown/overview/changelog.md b/src/site/markdown/overview/changelog.md
index f0cc2b12e0..b25021aa3b 100644
--- a/src/site/markdown/overview/changelog.md
+++ b/src/site/markdown/overview/changelog.md
@@ -1,61 +1,16 @@
# Changelog
-## 04-November-2016 - 5.3.8
+## ????? - 5.3.9-SNAPSHOT
-**Summary**
-
-* 1 feature requests
-* 6 pull requests
-* 17 bug fixes
+**New Supported Languages:**
**Feature Requests and Improvements:**
-* [#1360](https://sourceforge.net/p/pmd/bugs/1360/): \[core] \[java] Provide backwards compatibility for PMD configuration file
+**New/Modified/Deprecated Rules:**
**Pull Requests:**
-* [#35](https://github.com/adangel/pmd/pull/35): \[javascript] Javascript tokenizer now ignores comment tokens.
-* [#103](https://github.com/pmd/pmd/pull/103): \[java] Fix for 1501: CyclomaticComplexity rule causes OOM when class reporting is disabled
-* [#111](https://github.com/pmd/pmd/pull/111): \[java] Fix BooleanInstantiationRule for Java 8
-* [#112](https://github.com/pmd/pmd/pull/112): \[java] Fix ClassCastException on CloneMethodMustImplementCloneable
-* [#113](https://github.com/pmd/pmd/pull/113): \[java] Fix ClassCastException on SignatureDeclareThrowsException
-* [#119](https://github.com/pmd/pmd/pull/119): \[plsql] Fix PMD issue 1531- endless loop followed by OOM while parsing (PL)SQL
-
**Bugfixes:**
-* java
- * [#1501](https://sourceforge.net/p/pmd/bugs/1501/): \[java] \[apex] CyclomaticComplexity rule causes OOM when class reporting is disabled
-* java-basic/BooleanInstantiation
- * [#1533](https://sourceforge.net/p/pmd/bugs/1533/): \[java] BooleanInstantiation: ClassCastException with Annotation
-* java-comments
- * [#1522](https://sourceforge.net/p/pmd/bugs/1522/): \[java] CommentRequired: false positive
-* java-design/CloseResource
- * [#1479](https://sourceforge.net/p/pmd/bugs/1479/): \[java] CloseResource: false positive on Statement
-* java-imports/UnusedImports
- * [#1529](https://sourceforge.net/p/pmd/bugs/1529/): \[java] UnusedImports: The created rule violation has no class name
-* java-typeresolution/CloneMethodMustImplementCloneable
- * [#1532](https://sourceforge.net/p/pmd/bugs/1532/): \[java] CloneMethodMustImplementCloneable: Implemented Interface extends Cloneable
- * [#1534](https://sourceforge.net/p/pmd/bugs/1534/): \[java] CloneMethodMustImplementCloneable: ClassCastException with Annotation (java8)
-* java-typeresolution/SignatureDeclareThrowsException
- * [#1535](https://sourceforge.net/p/pmd/bugs/1535/): \[java] SignatureDeclareThrowsException: ClassCastException with Annotation
-* java-unusedcode/UnusedLocalVariable
- * [#1484](https://sourceforge.net/p/pmd/bugs/1484/): \[java] UnusedLocalVariable: false positive - parenthesis
-* java-unusedcode/UnusedModifier
- * [#1480](https://sourceforge.net/p/pmd/bugs/1480/): \[java] UnusedModifier: false positive on public modifier used with inner interface in enum
-* plsql
- * [#1520](https://sourceforge.net/p/pmd/bugs/1520/): \[plsql] Missing PL/SQL language constructs in parser: Is Of Type, Using
- * [#1527](https://sourceforge.net/p/pmd/bugs/1527/): \[plsql] PRAGMA AUTONOMOUS_TRANSACTION gives processing errors
- * [#1531](https://sourceforge.net/p/pmd/bugs/1531/): \[plsql] OOM/Endless loop while parsing (PL)SQL
-* General
- * [#1481](https://sourceforge.net/p/pmd/bugs/1481/): \[core] CPD: no problems found results in blank file instead of empty xml
- * [#1499](https://sourceforge.net/p/pmd/bugs/1499/): \[core] CPD test break PMD 5.5.1 build on Windows
- * [#1506](https://sourceforge.net/p/pmd/bugs/1506/): \[core] When runing any RuleTst, start/end methods not called
- * [#1508](https://sourceforge.net/p/pmd/bugs/1508/): \[core] \[java] PMD is leaking file handles
-
**API Changes:**
-* New command line parameter for PMD: `-norulesetcompatibility` - this disables the ruleset factory
- compatibility filter and fails, if e.g. an old rule name is used in the ruleset.
- See also [#1360](https://sourceforge.net/p/pmd/bugs/1360/).
- This option is also available for the ant task: `true`.
-* CPD: If no problems found, an empty report will be output instead of nothing. See also [#1481](https://sourceforge.net/p/pmd/bugs/1481/)