diff --git a/Changelog.rst b/Changelog.rst
index 704d3ae..e4c21ae 100644
--- a/Changelog.rst
+++ b/Changelog.rst
@@ -8,6 +8,9 @@ ChangeLog
 WIP (add new stuff for the next release)
 ========================================
 
+OfflineIMAP v6.5.4 (2012-06-02)
+=================================
+
 * bump bundled imaplib2 library 2.29 --> 2.33
 * Actually perform the SSL fingerprint check (reported by J. Cook)
 * Curses UI, don't use colors after we shut down curses already (C.Höger)
diff --git a/offlineimap/__init__.py b/offlineimap/__init__.py
index 81dcbac..77495e4 100644
--- a/offlineimap/__init__.py
+++ b/offlineimap/__init__.py
@@ -1,7 +1,7 @@
 __all__ = ['OfflineImap']
 
 __productname__ = 'OfflineIMAP'
-__version__     = "6.5.3.1"
+__version__     = "6.5.4"
 __copyright__   = "Copyright 2002-2012 John Goerzen & contributors"
 __author__      = "John Goerzen"
 __author_email__= "john@complete.org"