diff --git a/Changelog.draft.rst b/Changelog.draft.rst
index edd0f75..9063d5e 100644
--- a/Changelog.draft.rst
+++ b/Changelog.draft.rst
@@ -13,32 +13,12 @@ others.
 New Features
 ------------
 
-* When a message upload/download fails, we do not abort the whole folder
-  synchronization, but only skip that message, informing the user at the
-  end of the sync run.
- 
-* If you connect via ssl and 'cert_fingerprint' is configured, we check
-  that the server certificate is actually known and identical by
-  comparing the stored sha1 fingerprint with the current one.
-
 Changes
 -------
 
-* Refactor our IMAPServer class. Background work without user-visible
-  changes.
-* Remove the configurability of the Blinkenlights statuschar. It
-  cluttered the main configuration file for little gain.
-* Updated bundled imaplib2 to version 2.28.
-
 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.
-* Selecting inexistent folders specified in folderincludes now throws
-  nice errors and continues to sync with all other folders rather than
-  exiting offlineimap with a traceback.
-
 Pending for the next major release
 ==================================
 
diff --git a/Changelog.rst b/Changelog.rst
index 95a13b8..4bdff19 100644
--- a/Changelog.rst
+++ b/Changelog.rst
@@ -12,6 +12,45 @@ ChangeLog
   releases announces.
 
 
+OfflineIMAP v6.3.5-rc1 (2011-09-12)
+===================================
+
+Notes
+-----
+
+Idle feature and SQLite backend leave the experimental stage! ,-)
+
+New Features
+------------
+
+* When a message upload/download fails, we do not abort the whole folder
+  synchronization, but only skip that message, informing the user at the
+  end of the sync run.
+ 
+* If you connect via ssl and 'cert_fingerprint' is configured, we check
+  that the server certificate is actually known and identical by
+  comparing the stored sha1 fingerprint with the current one.
+
+Changes
+-------
+
+* Refactor our IMAPServer class. Background work without user-visible
+  changes.
+* Remove the configurability of the Blinkenlights statuschar. It
+  cluttered the main configuration file for little gain.
+* Updated bundled imaplib2 to version 2.28.
+
+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.
+* Selecting inexistent folders specified in folderincludes now throws
+  nice errors and continues to sync with all other folders rather than
+  exiting offlineimap with a traceback.
+
+
+
 OfflineIMAP v6.3.4 (2011-08-10)
 ===============================
 
@@ -26,6 +65,7 @@ Changes
 * Handle when UID can't be found on saved messages.
 
 
+
 OfflineIMAP v6.3.4-rc4 (2011-07-27)
 ===================================
 
diff --git a/offlineimap/__init__.py b/offlineimap/__init__.py
index 5070ac7..4eeb648 100644
--- a/offlineimap/__init__.py
+++ b/offlineimap/__init__.py
@@ -1,7 +1,7 @@
 __all__ = ['OfflineImap']
 
 __productname__ = 'OfflineIMAP'
-__version__     = "6.3.4"
+__version__     = "6.3.5-rc1"
 __copyright__   = "Copyright 2002-2011 John Goerzen & contributors"
 __author__      = "John Goerzen"
 __author_email__= "john@complete.org"