diff --git a/Changelog.draft.rst b/Changelog.draft.rst
index 23839ed..76a0ea3 100644
--- a/Changelog.draft.rst
+++ b/Changelog.draft.rst
@@ -13,19 +13,8 @@ others.
 New Features
 ------------
 
-* Make folders containing quotes work rather than crashing
-  (reported by Mark Eichin)
-
 Changes
 -------
 
-* Slight performance enhancement uploading mails to an IMAP server in the
-  common case.
-* Enforce basic UI when using the --info switch
-
 Bug Fixes
 ---------
-
-* Fix python2.6 compatibility with the TTYUI backend (crash)
-* Fix TTYUI regression from 6.5.2 in refresh loop (crash)
-* Fix crashes related to UIDVALIDITY returning "None"
diff --git a/Changelog.rst b/Changelog.rst
index 137fcbb..c0fd517 100644
--- a/Changelog.rst
+++ b/Changelog.rst
@@ -11,7 +11,7 @@ ChangeLog
   on releases. And because I'm lazy, it will also be used as a draft for the
   releases announces.
 
-OfflineIMAP v6.5.2.1-rc1 (2012-01-20)
+OfflineIMAP v6.5.2.1 (2012-04-04)
 =====================================
 
 * Fix python2.6 compatibility with the TTYUI backend (crash)
@@ -28,6 +28,11 @@ OfflineIMAP v6.5.2.1-rc1 (2012-01-20)
 
 * Improve delete msg performance with SQLITE backend
 
+* Enforce basic UI when using the --info switch
+
+* Remove the Gmail "realdelete" option, as it could lead to potential
+  data loss.
+
 OfflineIMAP v6.5.2 (2012-01-17)
 ===============================
 
diff --git a/offlineimap/__init__.py b/offlineimap/__init__.py
index ccdf898..0dc0943 100644
--- a/offlineimap/__init__.py
+++ b/offlineimap/__init__.py
@@ -1,7 +1,7 @@
 __all__ = ['OfflineImap']
 
 __productname__ = 'OfflineIMAP'
-__version__     = "6.5.2.1-rc1"
+__version__     = "6.5.2.1"
 __copyright__   = "Copyright 2002-2012 John Goerzen & contributors"
 __author__      = "John Goerzen"
 __author_email__= "john@complete.org"