diff --git a/Changelog.rst b/Changelog.rst
new file mode 100644
index 0000000..020e650
--- /dev/null
+++ b/Changelog.rst
@@ -0,0 +1,97 @@
+=========
+ChangeLog
+=========
+
+**NOTE FROM THE MAINTAINER:**
+  Contributors should use the `WIP` section in order to add changes they are
+  working on. I will use it to make the new changelog entry on releases. And
+  because I'm lazy, it will also be used as a draft for the releases announces.
+  Users should skip the `WIP` section: **it is a draft**.
+
+
+`WIP (coming releases)`
+=======================
+
+Notes
+-----
+
+New Features
+------------
+
+Changes
+-------
+
+Bug Fixes
+---------
+
+
+
+OfflineIMAP v6.3.2-rc1 (2010-12-19)
+===================================
+
+We are beginning a tests cycle. If feature topics are sent, I may merge or
+delay them until the next stable release.
+
+New Features
+------------
+
+* Primitive implementation of SSL certificates check.
+
+Changes
+-------
+
+* Use OptionParser instead of getopts.
+* Code cleanups.
+
+Bug Fixes
+---------
+
+* Fix reading password from UI.
+
+
+OfflineIMAP v6.3.1 (2010-12-11)
+===============================
+
+Notes
+-----
+
+Yes, I know I've just annouced the v6.3.0 in the same week. As said, it
+was not really a true release for the software. This last release
+includes fixes and improvements it might be nice to update to.
+
+Thanks to every body who helped to make this release with patches and
+tips through the mailing list. This is clearly a release they own.
+
+Changes
+-------
+
+* cProfile becomes the default profiler. Sebastian Spaeth did refactoring to
+  prepare to the coming unit test suites.
+* UI output formating enhanced.
+* Some code cleanups.
+
+Bug Fixes
+---------
+
+* Fix possible overflow while working with Exchange.
+* Fix time sleep while exiting threads.
+
+
+OfflineIMAP v6.3.0 (2010-12-09)
+===============================
+
+Notes
+-----
+
+This release is more "administrative" than anything else and mainly marks the
+change of the maintainer. New workflow and policy for developers come in.  BTW,
+I don't think I'll maintain debian/changelog. At least, not in the debian way.
+
+Most users and maintainers may rather want to skip this release.
+
+Bug Fixes
+---------
+
+* Fix terminal display on exit.
+* netrc password authentication.
+* User name querying from netrc.
diff --git a/Makefile b/Makefile
index f184835..64960a8 100644
--- a/Makefile
+++ b/Makefile
@@ -37,10 +37,11 @@ clean:
 man:
 	@$(MAKE) -C docs man
 
-doc: 
+doc:
 	@$(MAKE) -C docs
 	rst2html.py README.rst readme.html
 	rst2html.py SubmittingPatches.rst SubmittingPatches.html
+	rst2html.py Changelog.rst Changelog.html
 
 targz: ../$(TARGZ)
 ../$(TARGZ):