diff --git a/head/TODO b/head/TODO
index 38e852a..9eee13a 100644
--- a/head/TODO
+++ b/head/TODO
@@ -1,4 +1,9 @@
 * Add an option to handle the network exception that results if a connection
 to the IMAP server fails, or there is another socket error.
 
-* Force unidirectional sync for read-only folders.
\ No newline at end of file
+* Force unidirectional sync for read-only folders.
+
+* Fix Tk warn()
+
+* Fix uidvalidity workaround for empty folders in UW IMAP
+
diff --git a/head/debian/changelog b/head/debian/changelog
index e86e70c..140cdc2 100644
--- a/head/debian/changelog
+++ b/head/debian/changelog
@@ -1,3 +1,11 @@
+offlineimap (3.0.0) unstable; urgency=low
+
+  * Introduced a new graphical user interface written with Tkinter.
+  * Made IMAP folder addmessagesflags() resiliant to a server refusing
+    to return a full set of new message flags.  Closes: #152587.
+
+ -- John Goerzen <jgoerzen@complete.org>  Thu, 11 Jul 2002 08:35:42 -0500
+
 offlineimap (2.0.8) unstable; urgency=low
 
   * Modified the IMAP folder to use SELECT rather than STATUS more often.
diff --git a/head/offlineimap/version.py b/head/offlineimap/version.py
index 56ac04f..544ae00 100644
--- a/head/offlineimap/version.py
+++ b/head/offlineimap/version.py
@@ -1,5 +1,5 @@
 productname = 'OfflineIMAP'
-versionstr = "2.0.8"
+versionstr = "3.0.0"
 
 versionlist = versionstr.split(".")
 major = versionlist[0]