diff --git a/Changelog.rst b/Changelog.rst
index 7fe4d4b..f369aaa 100644
--- a/Changelog.rst
+++ b/Changelog.rst
@@ -11,6 +11,18 @@ ChangeLog
   on releases. And because I'm lazy, it will also be used as a draft for the
   releases announces.
 
+OfflineIMAP v6.4.2 (2011-12-01)
+===============================
+
+* IMAP<->IMAP sync with a readonly local IMAP repository failed with a
+  rather mysterious "TypeError: expected a character buffer object"
+  error. Fix this my retrieving the list of folders early enough even
+  for readonly repositories.
+
+* Fix regression from 6.4.0. When using local Maildirs with "/" as a
+  folder separator, all folder names would get a trailing slash
+  appended, which is plain wrong.
+
 OfflineIMAP v6.4.1 (2011-11-17)
 ===============================
 
diff --git a/offlineimap/__init__.py b/offlineimap/__init__.py
index 38a517c..b7b3f53 100644
--- a/offlineimap/__init__.py
+++ b/offlineimap/__init__.py
@@ -1,7 +1,7 @@
 __all__ = ['OfflineImap']
 
 __productname__ = 'OfflineIMAP'
-__version__     = "6.4.1"
+__version__     = "6.4.2"
 __copyright__   = "Copyright 2002-2011 John Goerzen & contributors"
 __author__      = "John Goerzen"
 __author_email__= "john@complete.org"