diff --git a/ChangeLog b/ChangeLog
index e2304b31d..15d10369b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-26  Thomas Thurman  <tthurman@gnome.org>
+
+        * tools/release-wrangler.py: ANY post-release bump is now the
+	most recent, not just the one that matches the current version.
+	Otherwise, you can't use these tools straight after a branch.
+	The changeset before this one was mislabelled because of this.
+
 2008-02-26  Thomas Thurman  <tthurman@gnome.org>
 
         * NEWS: 2.23.0 release.
@@ -24,6 +31,7 @@
 	function containing duplicated code from elsewhere.
 	* src/core/prefs.c (init_button_layout): only compiled when
 	HAVE_GCONF is not defined. Removed a compiler warning.
+
 2008-02-23  Thomas Thurman  <tthurman@gnome.org>
 
 	* tools/commit-wrangler.py: Print URL of changeset on success.
diff --git a/tools/release-wrangler.py b/tools/release-wrangler.py
index 78dbc6d0a..1f00cb59c 100644
--- a/tools/release-wrangler.py
+++ b/tools/release-wrangler.py
@@ -142,7 +142,8 @@ def scan_changelog(version):
   for line in changelog:
     if is_date(line):
       release_date = line[:10]
-    if "Post-release bump to %s.%s.%s." % (version['major'], version['minor'], version['micro']) in line:
+
+    if "Post-release bump to" in line:
       changelog = changelog[:changelog.index(line)+1]
       break
 
@@ -281,6 +282,7 @@ def edit_news_entry(version):
   tmp.close()
 
   os.system(favourite_editor()+' +6 %s ' % (filename))
+  # FIXME: if they abort, would be useful to abort here too
 
   # Write it out to NEWS