diff --git a/Changelog.draft.rst b/Changelog.draft.rst
index fecce26..87df0cd 100644
--- a/Changelog.draft.rst
+++ b/Changelog.draft.rst
@@ -13,9 +13,6 @@ others.
 New Features
 ------------
 
-* Added StartTLS support, it will automatically be used if the server
-  supports it.
-
 Changes
 -------
 
@@ -23,8 +20,6 @@ Bug Fixes
 ---------
 
 
-* We protect more robustly against asking for inexistent messages from the
-  IMAP server, when someone else deletes or moves messages while we sync.
 
 Pending for the next major release
 ==================================
diff --git a/Changelog.rst b/Changelog.rst
index 717e6f8..9e4bf8a 100644
--- a/Changelog.rst
+++ b/Changelog.rst
@@ -12,6 +12,38 @@ ChangeLog
   releases announces.
 
 
+OfflineIMAP v6.3.4-rc3 (2011-07-07)
+===================================
+
+Notes
+-----
+
+Here is a surprising release. :-)
+
+As expected we have a lot bug fixes in this round (see git log for details),
+including a fix for a bug we had for ages (details below) which is a very good
+news.
+
+What makes this cycle so unusual is that I merged a feature to support StartTLS
+automatically (thanks Sebastian!). Another very good news.
+
+We usually don't do much changes so late in a cycle. Now, things are highly
+calming down and I hope a lot of people will test this release. Next one could
+be the stable!
+
+New Features
+------------
+
+* Added StartTLS support, it will automatically be used if the server
+  supports it.
+
+Bug Fixes
+---------
+
+* We protect more robustly against asking for inexistent messages from the
+  IMAP server, when someone else deletes or moves messages while we sync.
+
+
 OfflineIMAP v6.3.4-rc2 (2011-06-15)
 ===================================
 
diff --git a/offlineimap/__init__.py b/offlineimap/__init__.py
index 688e50a..4a0e52c 100644
--- a/offlineimap/__init__.py
+++ b/offlineimap/__init__.py
@@ -1,7 +1,7 @@
 __all__ = ['OfflineImap']
 
 __productname__ = 'OfflineIMAP'
-__version__     = "6.3.4-rc2"
+__version__     = "6.3.4-rc3"
 __copyright__   = "Copyright 2002-2011 John Goerzen & contributors"
 __author__      = "John Goerzen"
 __author_email__= "john@complete.org"