diff --git a/src/site/markdown/overview/changelog-old.md b/src/site/markdown/overview/changelog-old.md
index a378300089..cf0016bef6 100644
--- a/src/site/markdown/overview/changelog-old.md
+++ b/src/site/markdown/overview/changelog-old.md
@@ -3,6 +3,111 @@
Previous versions of PMD can be downloaded here:
http://sourceforge.net/projects/pmd/files/pmd/
+
+## April 1, 2015 - 5.3.0
+
+**New Supported Languages:**
+
+* Matlab (CPD)
+* Objective-C (CPD)
+* Python (CPD)
+* Scala (CPD)
+
+**Feature Requests and Improvements:**
+
+* XML: Line numbers for XML documents are more accurate. This is a further improvement of [#1054](https://sourceforge.net/p/pmd/bugs/1054/).
+* CPD: New output format 'csv_with_linecount_per_file'
+* [#1320](https://sourceforge.net/p/pmd/bugs/1320/): Enhance SimplifyBooleanReturns checks
+* PMD exits with status `4` if any violations have been found. This behavior has been introduced to ease PMD
+ integration into scripts or hooks, such as SVN hooks.
+
+**New/Modified/Deprecated Rules:**
+
+The following rules have been
+enhanced
+:
+
+* Language Java, ruleset design.xml: The rule "SimplifyBooleanReturns" now also marks methods where the else case is omitted and just a return.
+ See also feature [#1320](https://sourceforge.net/p/pmd/bugs/1320/).
+
+The following rules are marked as
+deprecated
+and will be removed with the next release of PMD.
+
+* Language Java, ruleset basic.xml: The following rules have been *moved into the `empty.xml` ruleset*. You'll need
+ to enable the "empty" ruleset explicitly from now on, if you want to have these rules executed:
+
+ EmptyCatchBlock, EmptyIfStatement, EmptyWhileStmt, EmptyTryBlock, EmptyFinallyBlock, EmptySwitchStatements,
+ EmptySynchronizedBlock, EmptyStatementNotInLoop, EmptyInitializer, EmptyStatementBlock, EmptyStaticInitializer.
+
+* Language Java, ruleset basic.xml: The following rules have been *moved into the `unnecessary.xml` ruleset*. You'll need
+ to enable the "unnecessary" ruleset explicitly from now on, if you want to have these rules executed:
+
+ UnnecessaryConversionTemporary, UnnecessaryReturn, UnnecessaryFinalModifier, UselessOverridingMethod,
+ UselessOperationOnImmutable, UnusedNullCheckInEquals, UselessParentheses.
+
+* Language Java, ruleset design.xml: The rule "UncommentedEmptyMethod" *has been renamed* to "UncommentedEmptyMethodBody".
+ See also bug [#1283](https://sourceforge.net/p/pmd/bugs/1283/).
+
+* Language Java, ruleset controversial.xml: The rule "BooleanInversion" is deprecated and *will be removed* with
+ the next release. See [#1277](https://sourceforge.net/p/pmd/bugs/1277/) for more details.
+
+**Pull Requests:**
+
+* [#11](https://github.com/adangel/pmd/pull/11): Added support for Python to CPD.
+* [#12](https://github.com/adangel/pmd/pull/12): Added support for Matlab to CPD.
+* [#13](https://github.com/adangel/pmd/pull/13): Added support for Objective-C to CPD.
+* [#14](https://github.com/adangel/pmd/pull/14): Added support for Scala to CPD.
+* [#15](https://github.com/adangel/pmd/pull/15): (pmd-cs) Fixed incorrect line numbers after mutiline comments and verbatim strings.
+* [#16](https://github.com/adangel/pmd/pull/16): Fixed several C++ lexical / tokenize errors.
+* [#17](https://github.com/adangel/pmd/pull/17): Fixed '--files' command line option of CPD, so it also works for files and not only for directories.
+* [#18](https://github.com/adangel/pmd/pull/18): Created extra CSV output format `csv_with_linecount_per_file` which outputs the correct line count per file.
+* [#19](https://github.com/adangel/pmd/pull/19): Fixed exit status of PMD when error occurs
+* [#48](https://github.com/pmd/pmd/pull/48): Handle NoClassDefFoundError along ClassNotFoundException
+* [#49](https://github.com/pmd/pmd/pull/49): Fix some false positives in UnusedPrivateField
+* [#50](https://github.com/pmd/pmd/pull/50): Add missing assertions in JUnitAssertionsShouldIncludeMessage test
+* [#51](https://github.com/pmd/pmd/pull/51): [JUnit] Check assertion message present in assertEquals with delta
+* [#52](https://github.com/pmd/pmd/pull/52): Improves JDK8 support for default methods and static methods in interfaces
+
+**Bugfixes:**
+
+* [#914](https://sourceforge.net/p/pmd/bugs/914/): False +ve from UnusedImports with wildcard static imports
+* [#1197](https://sourceforge.net/p/pmd/bugs/1197/): JUnit4TestShouldUseTestAnnotation for private method
+* [#1277](https://sourceforge.net/p/pmd/bugs/1277/): Delete BooleanInversion as it makes no sense
+* [#1283](https://sourceforge.net/p/pmd/bugs/1283/): Rename UncommentedEmptyMethod to UncommentedEmptyMethodBody
+* [#1296](https://sourceforge.net/p/pmd/bugs/1296/): PMD UnusedPrivateMethod invalid detection of 'private void method(int,boolean,Integer...)'
+* [#1298](https://sourceforge.net/p/pmd/bugs/1298/): Member variable int type with value 0xff000000 causes processing error
+* [#1299](https://sourceforge.net/p/pmd/bugs/1299/): MethodReturnsInternalArray false positive
+* [#1302](https://sourceforge.net/p/pmd/bugs/1302/): False Positive: UnusedPrivateField when accessed by inner class
+* [#1303](https://sourceforge.net/p/pmd/bugs/1303/): OverrideBothEqualsAndHashcodeRule does not work on class implements resolvable interfaces
+* [#1304](https://sourceforge.net/p/pmd/bugs/1304/): UseCollectionIsEmpty false positive comparing to 1
+* [#1305](https://sourceforge.net/p/pmd/bugs/1305/): variable declaration inside switch causes ClassCastException
+* [#1306](https://sourceforge.net/p/pmd/bugs/1306/): False positive on duplicate when using static imports
+* [#1307](https://sourceforge.net/p/pmd/bugs/1307/): False positive: SingularField and lambda-expression
+* [#1308](https://sourceforge.net/p/pmd/bugs/1308/): PMD runs endlessly on some generated files
+* [#1312](https://sourceforge.net/p/pmd/bugs/1312/): Rule reference must not override rule name of referenced rule
+* [#1313](https://sourceforge.net/p/pmd/bugs/1313/): Missing assertion message in assertEquals with delta not detected
+* [#1316](https://sourceforge.net/p/pmd/bugs/1316/): Multi Rule Properties with delimiter not possible
+* [#1317](https://sourceforge.net/p/pmd/bugs/1317/): RuntimeException when parsing class with multiple lambdas
+* [#1319](https://sourceforge.net/p/pmd/bugs/1319/): PMD stops with NoClassDefFoundError (typeresolution)
+* [#1321](https://sourceforge.net/p/pmd/bugs/1321/): CPD format XML fails with NullPointer
+* [#1322](https://sourceforge.net/p/pmd/bugs/1322/): MethodReturnsInternalArray on private methods
+* [#1323](https://sourceforge.net/p/pmd/bugs/1323/): False positive case of UseAssertTrueInsteadOfAssertEquals
+* [#1324](https://sourceforge.net/p/pmd/bugs/1324/): MethodReturnsInternalArray false positive with clone()
+* [#1325](https://sourceforge.net/p/pmd/bugs/1325/): Inner class declared within a method fails to parse (ClassCastException)
+* [#1326](https://sourceforge.net/p/pmd/bugs/1326/): PMD 5.3.0-SNAPSHOT doesn't compile under Windows
+
+**API Changes:**
+
+* `net.sourceforge.pmd.cpd.Match.iterator()` now returns an iterator of the new type `net.sourceforge.pmd.cpd.Mark` instead
+ of TokenEntry. A `Mark` contains all the informations about each single duplication, including the TokenEntry via `Mark.getToken()`.
+ This Mark is useful for reporting the correct line count for each duplication. Previously only one line count was available.
+ As for some languages CPD can be instructed to ignore comments, the line count could be different in the different files
+ for the same duplication.
+
+* pmd-test: The utility class `StreamUtil` is deprecated. Just use Apache Commons IO Utils instead.
+
+
## December 21, 2014 - 5.2.3:
**Feature Requests and Improvements:**
diff --git a/src/site/markdown/overview/changelog.md b/src/site/markdown/overview/changelog.md
index ea0c3b4578..245d124e81 100644
--- a/src/site/markdown/overview/changelog.md
+++ b/src/site/markdown/overview/changelog.md
@@ -1,104 +1,15 @@
# Changelog
-## April 1, 2015 - 5.3.0
+## ????? - 5.3.1
**New Supported Languages:**
-* Matlab (CPD)
-* Objective-C (CPD)
-* Python (CPD)
-* Scala (CPD)
-
-**Feature Requests and Improvements:**
-
-* XML: Line numbers for XML documents are more accurate. This is a further improvement of [#1054](https://sourceforge.net/p/pmd/bugs/1054/).
-* CPD: New output format 'csv_with_linecount_per_file'
-* [#1320](https://sourceforge.net/p/pmd/bugs/1320/): Enhance SimplifyBooleanReturns checks
-* PMD exits with status `4` if any violations have been found. This behavior has been introduced to ease PMD
- integration into scripts or hooks, such as SVN hooks.
+**Feature Request and Improvements:**
**New/Modified/Deprecated Rules:**
-The following rules have been
-enhanced
-:
-
-* Language Java, ruleset design.xml: The rule "SimplifyBooleanReturns" now also marks methods where the else case is omitted and just a return.
- See also feature [#1320](https://sourceforge.net/p/pmd/bugs/1320/).
-
-The following rules are marked as
-deprecated
-and will be removed with the next release of PMD.
-
-* Language Java, ruleset basic.xml: The following rules have been *moved into the `empty.xml` ruleset*. You'll need
- to enable the "empty" ruleset explicitly from now on, if you want to have these rules executed:
-
- EmptyCatchBlock, EmptyIfStatement, EmptyWhileStmt, EmptyTryBlock, EmptyFinallyBlock, EmptySwitchStatements,
- EmptySynchronizedBlock, EmptyStatementNotInLoop, EmptyInitializer, EmptyStatementBlock, EmptyStaticInitializer.
-
-* Language Java, ruleset basic.xml: The following rules have been *moved into the `unnecessary.xml` ruleset*. You'll need
- to enable the "unnecessary" ruleset explicitly from now on, if you want to have these rules executed:
-
- UnnecessaryConversionTemporary, UnnecessaryReturn, UnnecessaryFinalModifier, UselessOverridingMethod,
- UselessOperationOnImmutable, UnusedNullCheckInEquals, UselessParentheses.
-
-* Language Java, ruleset design.xml: The rule "UncommentedEmptyMethod" *has been renamed* to "UncommentedEmptyMethodBody".
- See also bug [#1283](https://sourceforge.net/p/pmd/bugs/1283/).
-
-* Language Java, ruleset controversial.xml: The rule "BooleanInversion" is deprecated and *will be removed* with
- the next release. See [#1277](https://sourceforge.net/p/pmd/bugs/1277/) for more details.
-
**Pull Requests:**
-* [#11](https://github.com/adangel/pmd/pull/11): Added support for Python to CPD.
-* [#12](https://github.com/adangel/pmd/pull/12): Added support for Matlab to CPD.
-* [#13](https://github.com/adangel/pmd/pull/13): Added support for Objective-C to CPD.
-* [#14](https://github.com/adangel/pmd/pull/14): Added support for Scala to CPD.
-* [#15](https://github.com/adangel/pmd/pull/15): (pmd-cs) Fixed incorrect line numbers after mutiline comments and verbatim strings.
-* [#16](https://github.com/adangel/pmd/pull/16): Fixed several C++ lexical / tokenize errors.
-* [#17](https://github.com/adangel/pmd/pull/17): Fixed '--files' command line option of CPD, so it also works for files and not only for directories.
-* [#18](https://github.com/adangel/pmd/pull/18): Created extra CSV output format `csv_with_linecount_per_file` which outputs the correct line count per file.
-* [#19](https://github.com/adangel/pmd/pull/19): Fixed exit status of PMD when error occurs
-* [#48](https://github.com/pmd/pmd/pull/48): Handle NoClassDefFoundError along ClassNotFoundException
-* [#49](https://github.com/pmd/pmd/pull/49): Fix some false positives in UnusedPrivateField
-* [#50](https://github.com/pmd/pmd/pull/50): Add missing assertions in JUnitAssertionsShouldIncludeMessage test
-* [#51](https://github.com/pmd/pmd/pull/51): [JUnit] Check assertion message present in assertEquals with delta
-* [#52](https://github.com/pmd/pmd/pull/52): Improves JDK8 support for default methods and static methods in interfaces
-
**Bugfixes:**
-* [#914](https://sourceforge.net/p/pmd/bugs/914/): False +ve from UnusedImports with wildcard static imports
-* [#1197](https://sourceforge.net/p/pmd/bugs/1197/): JUnit4TestShouldUseTestAnnotation for private method
-* [#1277](https://sourceforge.net/p/pmd/bugs/1277/): Delete BooleanInversion as it makes no sense
-* [#1283](https://sourceforge.net/p/pmd/bugs/1283/): Rename UncommentedEmptyMethod to UncommentedEmptyMethodBody
-* [#1296](https://sourceforge.net/p/pmd/bugs/1296/): PMD UnusedPrivateMethod invalid detection of 'private void method(int,boolean,Integer...)'
-* [#1298](https://sourceforge.net/p/pmd/bugs/1298/): Member variable int type with value 0xff000000 causes processing error
-* [#1299](https://sourceforge.net/p/pmd/bugs/1299/): MethodReturnsInternalArray false positive
-* [#1302](https://sourceforge.net/p/pmd/bugs/1302/): False Positive: UnusedPrivateField when accessed by inner class
-* [#1303](https://sourceforge.net/p/pmd/bugs/1303/): OverrideBothEqualsAndHashcodeRule does not work on class implements resolvable interfaces
-* [#1304](https://sourceforge.net/p/pmd/bugs/1304/): UseCollectionIsEmpty false positive comparing to 1
-* [#1305](https://sourceforge.net/p/pmd/bugs/1305/): variable declaration inside switch causes ClassCastException
-* [#1306](https://sourceforge.net/p/pmd/bugs/1306/): False positive on duplicate when using static imports
-* [#1307](https://sourceforge.net/p/pmd/bugs/1307/): False positive: SingularField and lambda-expression
-* [#1308](https://sourceforge.net/p/pmd/bugs/1308/): PMD runs endlessly on some generated files
-* [#1312](https://sourceforge.net/p/pmd/bugs/1312/): Rule reference must not override rule name of referenced rule
-* [#1313](https://sourceforge.net/p/pmd/bugs/1313/): Missing assertion message in assertEquals with delta not detected
-* [#1316](https://sourceforge.net/p/pmd/bugs/1316/): Multi Rule Properties with delimiter not possible
-* [#1317](https://sourceforge.net/p/pmd/bugs/1317/): RuntimeException when parsing class with multiple lambdas
-* [#1319](https://sourceforge.net/p/pmd/bugs/1319/): PMD stops with NoClassDefFoundError (typeresolution)
-* [#1321](https://sourceforge.net/p/pmd/bugs/1321/): CPD format XML fails with NullPointer
-* [#1322](https://sourceforge.net/p/pmd/bugs/1322/): MethodReturnsInternalArray on private methods
-* [#1323](https://sourceforge.net/p/pmd/bugs/1323/): False positive case of UseAssertTrueInsteadOfAssertEquals
-* [#1324](https://sourceforge.net/p/pmd/bugs/1324/): MethodReturnsInternalArray false positive with clone()
-* [#1325](https://sourceforge.net/p/pmd/bugs/1325/): Inner class declared within a method fails to parse (ClassCastException)
-* [#1326](https://sourceforge.net/p/pmd/bugs/1326/): PMD 5.3.0-SNAPSHOT doesn't compile under Windows
-
**API Changes:**
-
-* `net.sourceforge.pmd.cpd.Match.iterator()` now returns an iterator of the new type `net.sourceforge.pmd.cpd.Mark` instead
- of TokenEntry. A `Mark` contains all the informations about each single duplication, including the TokenEntry via `Mark.getToken()`.
- This Mark is useful for reporting the correct line count for each duplication. Previously only one line count was available.
- As for some languages CPD can be instructed to ignore comments, the line count could be different in the different files
- for the same duplication.
-
-* pmd-test: The utility class `StreamUtil` is deprecated. Just use Apache Commons IO Utils instead.