diff --git a/ChangeLog b/ChangeLog
index 1f08b57b2..0f750e359 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-12  Elijah Newren  <newren gmail com>
+
+	* configure.in: post-release version bump to 2.15.8
+
 2006-06-12  Elijah Newren  <newren gmail com>
 
 	* NEWS:	2.15.5 release
diff --git a/configure.in b/configure.in
index 0526a1762..ec21bd51d 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ AC_PREREQ(2.50)
 
 # Fibonacci sequence for micro version numbering:
 # 0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987
-AC_INIT([metacity], [2.15.5],
+AC_INIT([metacity], [2.15.8],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=metacity])
 
 AC_CONFIG_SRCDIR(src/display.c)