diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4c910ed..c9e2de95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@
 * Automatically load helper modules in helpers/ directory
 * Add pid for cleanup
 * Use guard/listen for file watching
+* Merge full i18n support
 
 2.0.14
 ====
diff --git a/TODO-BEFORE-3.0.md b/TODO-BEFORE-3.0.md
new file mode 100644
index 00000000..3b8243e2
--- /dev/null
+++ b/TODO-BEFORE-3.0.md
@@ -0,0 +1,2 @@
+* Finish i18n integration and documentation
+* Migrate from Padrino to ActionPack (nice to have)
\ No newline at end of file