3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b1c099a..ee2371e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+2.12.6:
+
 2007-02-10  Murray Cumming  <murrayc@murrayc.com>
 
         * examples/options/main.cc: Use a default value, to show that it 
diff --git a/NEWS b/NEWS
index e3811547..d85a6ffc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+2.12.6:
+
+* Options: Don't overwrite default arguments. This change was lost in 
+  March 2006, but now it is back.
+  (Armin Burgmeier)
+
 2.12.5:
 
 * Fix code generation when using the latest m4, and functions named 
diff --git a/configure.in b/configure.in
index bd449768..a5a04b1f 100644
--- a/configure.in
+++ b/configure.in
@@ -19,7 +19,7 @@ AC_PREREQ(2.50)
 #########################################################################
 GLIBMM_MAJOR_VERSION=2
 GLIBMM_MINOR_VERSION=12
-GLIBMM_MICRO_VERSION=5
+GLIBMM_MICRO_VERSION=6
 GLIBMM_VERSION=$GLIBMM_MAJOR_VERSION.$GLIBMM_MINOR_VERSION.$GLIBMM_MICRO_VERSION
 GLIBMM_RELEASE=$GLIBMM_MAJOR_VERSION.$GLIBMM_MINOR_VERSION
 AC_DEFINE_UNQUOTED([GLIBMM_MAJOR_VERSION], $GLIBMM_MAJOR_VERSION, [Major Version])