diff --git a/offlineimap/head/ChangeLog b/offlineimap/head/ChangeLog
index 15473a0..3176f1a 100644
--- a/offlineimap/head/ChangeLog
+++ b/offlineimap/head/ChangeLog
@@ -1,3 +1,73 @@
+------------------------------------------------------------------------
+rev 458:  jgoerzen | 2003-04-28 16:25:42 -0500 (Mon, 28 Apr 2003) | 3 lines
+Changed paths:
+   M /offlineimap/head/debian/changelog
+   M /offlineimap/head/offlineimap/CustomConfig.py
+   M /offlineimap/head/offlineimap/accounts.py
+   M /offlineimap/head/offlineimap.conf
+
+  * autorefresh may now be a floating-point value.  Closes: #190060.
+
+
+------------------------------------------------------------------------
+rev 457:  jgoerzen | 2003-04-28 16:17:30 -0500 (Mon, 28 Apr 2003) | 5 lines
+Changed paths:
+   M /offlineimap/head/debian/changelog
+   M /offlineimap/head/offlineimap/imaplib.py
+
+  * Made OfflineIMAP IPv6-aware.  Used the short patch from
+    Adriaan Peeters <apeeters@lashout.net> in Debian bug report 186636.
+    Closes: #186636.
+
+
+------------------------------------------------------------------------
+rev 456:  jgoerzen | 2003-04-28 15:52:03 -0500 (Mon, 28 Apr 2003) | 4 lines
+Changed paths:
+   M /offlineimap/head/debian/changelog
+   M /offlineimap/head/offlineimap/repository/IMAP.py
+
+  * Fixed a silly error relating to handling of the remotepassfile.
+    Closes: #189935.
+
+
+------------------------------------------------------------------------
+rev 455:  jgoerzen | 2003-04-28 15:48:55 -0500 (Mon, 28 Apr 2003) | 7 lines
+Changed paths:
+   M /offlineimap/head/debian/changelog
+   M /offlineimap/head/offlineimap/ui/UIBase.py
+
+  * Raise an exception when the status area is locked.  This will cause UIs
+    to go through their normal exception handling code.  In particular, for
+    the Curses.Blinkenlights interface, the Curses module will be stopped  
+    and the error message will be printed on the console.  Previously, this
+    error message would not have been visible.  Closes: #185709.
+
+
+------------------------------------------------------------------------
+rev 454:  jgoerzen | 2003-04-28 15:43:41 -0500 (Mon, 28 Apr 2003) | 2 lines
+Changed paths:
+   M /offlineimap/head/debian/changelog
+
+Updated bug closing number
+
+------------------------------------------------------------------------
+rev 453:  jgoerzen | 2003-04-28 14:04:22 -0500 (Mon, 28 Apr 2003) | 4 lines
+Changed paths:
+   M /offlineimap/head/debian/changelog
+   M /offlineimap/head/offlineimap/syncmaster.py
+   M /offlineimap/head/offlineimap/threadutil.py
+
+  * Backed out removal of SYNC_WITH_TIMER_TERMINATE code to deal with
+    completed syncs.  Without this code, -o broke because the app would
+    never terminate.  
+
+------------------------------------------------------------------------
+rev 451:  jgoerzen | 2003-04-28 09:16:58 -0500 (Mon, 28 Apr 2003) | 2 lines
+Changed paths:
+   M /offlineimap/head/ChangeLog
+
+Updated for 3.99.14
+
 ------------------------------------------------------------------------
 rev 450:  jgoerzen | 2003-04-28 09:16:30 -0500 (Mon, 28 Apr 2003) | 2 lines
 Changed paths:
diff --git a/offlineimap/head/bin/offlineimap b/offlineimap/head/bin/offlineimap
index 5e21668..4ae84e4 100644
--- a/offlineimap/head/bin/offlineimap
+++ b/offlineimap/head/bin/offlineimap
@@ -18,4 +18,4 @@
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 from offlineimap import init
-init.startup('3.99.14')
+init.startup('3.99.15')
diff --git a/offlineimap/head/debian/changelog b/offlineimap/head/debian/changelog
index a104722..1ea36a9 100644
--- a/offlineimap/head/debian/changelog
+++ b/offlineimap/head/debian/changelog
@@ -1,5 +1,6 @@
 offlineimap (3.99.15) unstable; urgency=low
 
+  * This is a 4.0 TRACK release, and may be unstable or in flux!
   * Backed out removal of SYNC_WITH_TIMER_TERMINATE code to deal with
     completed syncs.  Without this code, -o broke because the app would
     never terminate.  Closes: #190063.
@@ -15,10 +16,11 @@ offlineimap (3.99.15) unstable; urgency=low
     Closes: #186636.
   * autorefresh may now be a floating-point value.  Closes: #190060.
 
- -- John Goerzen <jgoerzen@complete.org>  Mon, 28 Apr 2003 14:00:32 -0500
+ -- John Goerzen <jgoerzen@complete.org>  Mon, 28 Apr 2003 17:30:32 -0500
 
 offlineimap (3.99.14) unstable; urgency=low
 
+  * This is a 4.0 TRACK release, and may be unstable or in flux!
   * Added the ability to use the top level of a Maildir as folder named
     ".".  Useful for generating Maildir trees for a Courier server.
   * Fixed the regular expression that fixes line endings to make sure to
@@ -37,6 +39,7 @@ offlineimap (3.99.14) unstable; urgency=low
 
 offlineimap (3.99.13) unstable; urgency=low
 
+  * This is a 4.0 TRACK release, and may be unstable or in flux!
   * Fixed password prompting for non-Curses UIs.
   * Fixed line-ending code to deal with files with mixed \n and \r\n
     codes.  This is a rare case, but now is more onerous because we now
diff --git a/offlineimap/head/offlineimap.py b/offlineimap/head/offlineimap.py
index 20f7952..acc9cbc 100644
--- a/offlineimap/head/offlineimap.py
+++ b/offlineimap/head/offlineimap.py
@@ -18,4 +18,4 @@
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 from offlineimap import init
-init.startup('3.99.14')
+init.startup('3.99.15')
diff --git a/offlineimap/head/offlineimap/version.py b/offlineimap/head/offlineimap/version.py
index 9d6d1da..e57c0fe 100644
--- a/offlineimap/head/offlineimap/version.py
+++ b/offlineimap/head/offlineimap/version.py
@@ -1,8 +1,8 @@
 productname = 'OfflineIMAP'
-versionstr = "3.99.14"
-revno = long('$Rev: 450 $'[6:-2])
+versionstr = "3.99.15"
+revno = long('$Rev: 459 $'[6:-2])
 revstr = "Rev %d" % revno
-datestr = '$Date: 2003-04-28 09:16:30 -0500 (Mon, 28 Apr 2003) $'
+datestr = '$Date: 2003-04-28 16:41:50 -0500 (Mon, 28 Apr 2003) $'
 
 versionlist = versionstr.split(".")
 major = versionlist[0]