diff --git a/Changelog.draft.rst b/Changelog.draft.rst
index 66501e2..fd445ac 100644
--- a/Changelog.draft.rst
+++ b/Changelog.draft.rst
@@ -13,31 +13,12 @@ others.
 New Features
 ------------
 
-* Enable 1-way synchronization by settting a [Repository ...] to
-  readonly = True. When e.g. using offlineimap for backup purposes you
-  can thus make sure that no changes in your backup trickle back into
-  the main IMAP server.
-* optional: experimental SQLite-based backend for the LocalStatus
-  cache. Plain text remains the default. Enable by setting
-  status_backend=sqlite in the [Account ...] section
-
 Changes
 -------
 
-* Reduced our sync logic from 4 passes to 3 passes (integrating upload of
-  "new" and "existing" messages into one function). This should result in a
-  slight speedup.
-* No whitespace is stripped from comma-separated arguments passed via
-  the -f option.
-* Give more detailed error when encountering a corrupt UID mapping file.
-
 Bug Fixes
 ---------
 
-* Drop connection if synchronisation failed. This is needed if resuming the
-  system from suspend mode gives a wrong connection.
-* Fix the offlineimap crash when invoking debug option 'thread'
-
 
 Pending for the next major release
 ==================================
diff --git a/Changelog.rst b/Changelog.rst
index b2912b3..0f5d6d1 100644
--- a/Changelog.rst
+++ b/Changelog.rst
@@ -12,6 +12,62 @@ ChangeLog
   releases announces.
 
 
+OfflineIMAP v6.3.4-rc1 (2011-05-16)
+===================================
+
+Notes
+-----
+
+Welcome to the v6.3.4 pre-release cycle. Your favorite IMAP tool wins 2 new
+features which were asked for a long time:
+* an experimental SQL-based backend for the local cache;
+* one-way synchronization cabability.
+
+Logic synchronization is reviewed and simplified (from 4 to 3 passes) giving
+improved performance.
+
+Lot of work was done to give OfflineIMAP a better code base. Raised errors can
+now rely on a new error system and should become the default in the coming
+releases.
+
+As usual, we ask our users to test this release as much as possible, especially
+the SQL backend. Have fun!
+
+New Features
+------------
+
+* Begin sphinx-based documentation for the code.
+* Enable 1-way synchronization by settting a [Repository ...] to
+  readonly = True. When e.g. using offlineimap for backup purposes you
+  can thus make sure that no changes in your backup trickle back into
+  the main IMAP server.
+* Optional: experimental SQLite-based backend for the LocalStatus
+  cache. Plain text remains the default.
+
+Changes
+-------
+
+* Start a enhanced error handling background system. This is designed to not
+  stop a whole sync process on all errors (not much used, yet).
+* Documentation improvements: the FAQ wins new entries and add a new HACKING
+  file for developers.
+* Lot of code cleanups.
+* Reduced our sync logic from 4 passes to 3 passes (integrating upload of
+  "new" and "existing" messages into one function). This should result in a
+  slight speedup.
+* No whitespace is stripped from comma-separated arguments passed via
+  the -f option.
+* Give more detailed error when encountering a corrupt UID mapping file.
+
+Bug Fixes
+---------
+
+* Drop connection if synchronization failed. This is needed if resuming the
+  system from suspend mode gives a wrong connection.
+* Fix the offlineimap crash when invoking debug option 'thread'.
+* Make 'thread' command line option work.
+
+
 OfflineIMAP v6.3.3 (2011-04-24)
 ===============================
 
diff --git a/offlineimap/__init__.py b/offlineimap/__init__.py
index 0a55a97..d7313cc 100644
--- a/offlineimap/__init__.py
+++ b/offlineimap/__init__.py
@@ -1,7 +1,7 @@
 __all__ = ['OfflineImap']
 
 __productname__ = 'OfflineIMAP'
-__version__     = "6.3.3"
+__version__     = "6.3.4-rc1"
 __copyright__   = "Copyright (C) 2002 - 2010 John Goerzen"
 __author__      = "John Goerzen"
 __author_email__= "john@complete.org"