diff --git a/Changelog.maint.rst b/Changelog.maint.rst
index 4371405..89db798 100644
--- a/Changelog.maint.rst
+++ b/Changelog.maint.rst
@@ -13,6 +13,21 @@ This is the Changelog of the maintenance branch.
   releases announces.
 
 
+OfflineIMAP v6.3.2.3 (2011-08-10)
+=================================
+
+Changes
+-------
+
+* Output more detailed error on corrupt LocalStatus.
+* More detailed error output on corrupt UID mapping files.
+
+Bug Fixes
+---------
+
+* Fix typo to force singlethreading in debug mode.
+
+
 OfflineIMAP v6.3.2.2 (2011-04-24)
 =================================
 
@@ -21,6 +36,7 @@ Changes
 
 * Improve traceback on some crashes.
 
+
 OfflineIMAP v6.3.2.1 (2011-03-23)
 =================================
 
diff --git a/Makefile b/Makefile
index 92ec040..518261f 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-VERSION=6.3.2.2
+VERSION=6.3.2.3
 TARGZ=offlineimap_$(VERSION).tar.gz
 SHELL=/bin/bash
 RST2HTML=`type rst2html 2>/dev/null 2>&1 && echo rst2html || echo rst2html.py`
diff --git a/offlineimap/__init__.py b/offlineimap/__init__.py
index 26b6a62..e228282 100644
--- a/offlineimap/__init__.py
+++ b/offlineimap/__init__.py
@@ -1,7 +1,7 @@
 __all__ = ['OfflineImap']
 
 __productname__ = 'OfflineIMAP'
-__version__     = "6.3.2.1"
+__version__     = "6.3.2.3"
 __copyright__   = "Copyright (C) 2002 - 2010 John Goerzen"
 __author__      = "John Goerzen"
 __author_email__= "john@complete.org"