diff --git a/.gitignore b/.gitignore
index 620e7e4..c5af353 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 # Generated files
-/docs/html/
+/docs/dev-doc/
 /build/
 *.pyc
 offlineimap.1
diff --git a/Changelog.draft.rst b/Changelog.draft.rst
deleted file mode 100644
index c2b7dbc..0000000
--- a/Changelog.draft.rst
+++ /dev/null
@@ -1,52 +0,0 @@
-=========
-ChangeLog
-=========
-
-Users should ignore this content: **it is draft**.
-
-Contributors should add entries here in the following section, on top of the
-others.
-
-`WIP (coming releases)`
-=======================
-
-New Features
-------------
-
-* --dry-run mode protects us from performing any actual action.
-    It will not precisely give the exact information what will
-    happen. If e.g. it would need to create a folder, it merely
-    outputs "Would create folder X", but not how many and which mails
-    it would transfer.
-
-Changes
--------
-
-* internal code changes to prepare for Python3
-
-* Improve user documentation of nametrans/folderfilter
-
-* Fixed some cases where invalid nametrans rules were not caught and
-  we would not propagate local folders to the remote repository.
-  (now tested in test03)
-
-* Revert "* Slight performance enhancement uploading mails to an IMAP
-  server in the common case." It might have led to instabilities.
-
-* Revamped documentation structure. `make` in the `docs` dir or `make
-  doc` in the root dir will now create the 1) man page and 2) the user
-  documentation using sphinx (requiring python-doctools, and
-  sphinx). The resulting user docs are in `docs/html`. You can also
-  only create the man pages with `make man` in the `docs` dir.
-
-* -f command line option only works on the untranslated remote
-  repository folder names now. Previously folderfilters had to match
-  both the local AND remote name which caused unwanted behavior in
-  combination with nametrans rules. Clarify in the help text.
-
-* Some better output when using nonsensical configuration settings
-
-Bug Fixes
----------
-
-* Improve compatability of the curses UI with python 2.6
diff --git a/Changelog.rst b/Changelog.rst
index 2b41ff1..f8bdfaa 100644
--- a/Changelog.rst
+++ b/Changelog.rst
@@ -5,11 +5,52 @@ ChangeLog
 :website: http://offlineimap.org
 
 
-**NOTE FROM THE MAINTAINER:**
-  Contributors should use the `WIP` section in Changelog.draft.rst 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.
+WIP (add new stuff for the next release)
+========================================
+
+New Features
+------------
+
+Changes
+-------
+
+Bug Fixes
+---------
+
+
+OfflineIMAP v6.5.3 (2012-04-02)
+===============================
+
+* --dry-run mode protects us from performing any actual action.  It will
+  not precisely give the exact information what will happen. If e.g. it
+  would need to create a folder, it merely outputs "Would create folder
+  X", but not how many and which mails it would transfer.
+
+* internal code changes to prepare for Python3
+
+* Improve user documentation of nametrans/folderfilter
+
+* Fixed some cases where invalid nametrans rules were not caught and
+  we would not propagate local folders to the remote repository.
+  (now tested in test03)
+
+* Revert "* Slight performance enhancement uploading mails to an IMAP
+  server in the common case." It might have led to instabilities.
+
+* Revamped documentation structure. `make` in the `docs` dir or `make
+  doc` in the root dir will now create the 1) man page and 2) the user
+  documentation using sphinx (requiring python-doctools, and
+  sphinx). The resulting user docs are in `docs/html`. You can also
+  only create the man pages with `make man` in the `docs` dir.
+
+* -f command line option only works on the untranslated remote
+  repository folder names now. Previously folderfilters had to match
+  both the local AND remote name which caused unwanted behavior in
+  combination with nametrans rules. Clarify in the help text.
+
+* Some better output when using nonsensical configuration settings
+
+* Improve compatability of the curses UI with python 2.6
 
 OfflineIMAP v6.5.2.1 (2012-04-04)
 =====================================
diff --git a/offlineimap/__init__.py b/offlineimap/__init__.py
index 0dc0943..5673a89 100644
--- a/offlineimap/__init__.py
+++ b/offlineimap/__init__.py
@@ -1,7 +1,7 @@
 __all__ = ['OfflineImap']
 
 __productname__ = 'OfflineIMAP'
-__version__     = "6.5.2.1"
+__version__     = "6.5.3"
 __copyright__   = "Copyright 2002-2012 John Goerzen & contributors"
 __author__      = "John Goerzen"
 __author_email__= "john@complete.org"