diff --git a/TODO-6-0-0.md b/TODO-6-0-0.md
new file mode 100644
index 0000000000..090a37036b
--- /dev/null
+++ b/TODO-6-0-0.md
@@ -0,0 +1,14 @@
+# TODO for 6.0.0
+
+*   pmd-core/src/main/java/net/sourceforge/pmd/Rule.java:
+    Make use of java bean naming conventions for getters/setters/booleans
+
+# Documentation need
+
+*   Document ruleset dtd
+    -> need to add "metrics" attribute
+    
+
+# Rules
+
+*   EmptyCatchBlock: By default ignore "ignored|expected" exception names
diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 268c634cca..ce564179ff 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -291,4 +291,4 @@ All existing rules have been updated to reflect these changes. If you have custo
 *   [#587](https://github.com/pmd/pmd/pull/587): \[core] Properties refactoring: Move static constants of ValueParser to class ValueParserConstants - [Clément Fournier](https://github.com/oowekyala)
 *   [#588](https://github.com/pmd/pmd/pull/588): \[java] XPath function to compute metrics - [Clément Fournier](https://github.com/oowekyala)
 *   [#598](https://github.com/pmd/pmd/pull/598): \[java] Fix #388: controversial.AvoidLiteralsInIfCondition 0.0 false positive - [Clément Fournier](https://github.com/oowekyala)
-
+*   [#602](https://github.com/pmd/pmd/pull/602): \[java] \[apex] Separate multifile analysis from metrics - [Clément Fournier](https://github.com/oowekyala)