diff --git a/bin/offlineimap b/bin/offlineimap
index d091346..26b06fe 100755
--- a/bin/offlineimap
+++ b/bin/offlineimap
@@ -18,4 +18,4 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 from offlineimap import init
-init.startup('5.99.15')
+init.startup('6.0.0')
diff --git a/debian/changelog b/debian/changelog
index 9731efe..488ee95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+offlineimap (6.0.0) unstable; urgency=low
+
+  * Updated version number to 6.0.0.  No other changes.  Calling this
+    the new stable version.
+
+ -- John Goerzen <jgoerzen@complete.org>  Tue, 20 May 2008 00:01:17 -0500
+
 offlineimap (5.99.15) unstable; urgency=low
 
   * Finally fix the LocalStatus issues.  Closes: #479798.
diff --git a/offlineimap.py b/offlineimap.py
index da99c18..ca32a21 100755
--- a/offlineimap.py
+++ b/offlineimap.py
@@ -18,4 +18,4 @@
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 from offlineimap import init
-init.startup('5.99.15')
+init.startup('6.0.0')
diff --git a/offlineimap/version.py b/offlineimap/version.py
index 0ca68bc..13c4426 100644
--- a/offlineimap/version.py
+++ b/offlineimap/version.py
@@ -1,5 +1,5 @@
 productname = 'OfflineIMAP'
-versionstr = "5.99.15"
+versionstr = "6.0.0"
 
 versionlist = versionstr.split(".")
 major = versionlist[0]