diff --git a/CHANGELOG b/CHANGELOG
index eeb6657..f7e2e44 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,13 @@
 
-Version 0.6.2   - ???
+Version 0.6.2   - 27 June 2006
+  * add -F/--filter-append option to append an arbitrary string to the IMAP 
+    filter string
+  * don't delete more than a certain number of messages at a time. The max 
+    command len is limited. Fixes bug 942403 (Archiving large IMAP folders fails)
+  * add SSL support per imaps URL (after patch by Tobias Gruetzmacher)
+  * add -P/--pwfile option to supply the IMAP password, so it does not end up in 
+    the shell history
+  * Fix SyntaxWarning: assignment to None (bug #843890)
   * Use the archive cut date rather than the actual time with the --suffix
     option. (Thanks Manuel Estrada Sainz)
 
diff --git a/Makefile b/Makefile
index 6ccb413..271af70 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 
-VERSION=0.6.1
+VERSION=0.6.2
 VERSION_TAG=v$(subst .,_,$(VERSION))
 TARFILE=archivemail-$(VERSION).tar.gz
 
diff --git a/archivemail.py b/archivemail.py
index bf6ab85..dfc1fba 100755
--- a/archivemail.py
+++ b/archivemail.py
@@ -22,7 +22,7 @@ Website: http://archivemail.sourceforge.net/
 """
 
 # global administrivia 
-__version__ = "archivemail v0.6.1"
+__version__ = "archivemail v0.6.2"
 __cvs_id__ = "$Id$"
 __copyright__ = """Copyright (C) 2002  Paul Rodger <paul@paulrodger.com>
 This is free software; see the source for copying conditions. There is NO
diff --git a/setup.py b/setup.py
index dfb5e79..5c2348e 100755
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ check_python_version()  # define & run this early - 'distutils.core' is new
 from distutils.core import setup
 
 setup(name="archivemail",
-      version="0.6.1",
+      version="0.6.2",
       description="archive and compress old email",
       license="GNU GPL",
       url="http://archivemail.sourceforge.net/",