diff --git a/Changelog.rst b/Changelog.rst
index 020e650..2a4d262 100644
--- a/Changelog.rst
+++ b/Changelog.rst
@@ -12,23 +12,53 @@ ChangeLog
 `WIP (coming releases)`
 =======================
 
-Notes
------
+.. Contributors should add entries here in the approppriate subsection, on top.
 
 New Features
 ------------
 
+* Makefile learn to build the package and make it the default.
+* Introduce a Changelog.
+* Migrate documentation to restructuredtext.
+
+* UIs get shorter and nicer names.
+    Pending until next major release.
+
+* Learn Sqlite support.
+    Stalled: it would need to learn the ability to choose between the current
+    format and SQL to help testing the long term.
+
+
 Changes
 -------
 
+* Imply single threading mode in debug mode exept for "-d thread".
+* Code and import cleanups.
+* Allow UI to have arbitrary names.
+* Code refactoring around UI and UIBase.
+* Improve version managment and make it easier.
+
 Bug Fixes
 ---------
 
+* Fixes in README.
+* Only verify hostname if we actually use CA cert.
+* Remove uneeded files.
+* Fix makefile clean for files having whitespaces.
+* Fix makefile to not remove unrelated files.
+* Introduce a true single threading mode.
+* Fix 'Ctrl+C' interruptions in threads.
+* Fix ssl ca-cert in the sample configuration file.
 
 
+.. Here comes history on what we did.
+
 OfflineIMAP v6.3.2-rc1 (2010-12-19)
 ===================================
 
+Notes
+-----
+
 We are beginning a tests cycle. If feature topics are sent, I may merge or
 delay them until the next stable release.