diff --git a/ChangeLog b/ChangeLog
index dd71501856..fc07561af0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-11  Sven Neumann  <sven@gimp.org>
+
+	* Made 2.3.12 development release.
+
+	* plug-ins/pygimp/Makefile.am (codegen_files): added missing files.
+
 2006-10-11  Raphaël Quinet  <raphael@gimp.org>
 
 	* app/xcf/xcf-load.c (xcf_load_tile_rle): workaround for bug
@@ -7,7 +13,7 @@
 2006-10-11  Sven Neumann  <sven@gimp.org>
 
 	* modules/Makefile.am: build the color-managed CMYK color selector
-	with the same filename as the naive implementation; they are
+	with the same filename as the naïve implementation; they are
 	mutually exclusive.
 
 2006-10-11  Sven Neumann  <sven@gimp.org>
diff --git a/docs/gimprc.5.in b/docs/gimprc.5.in
index fbdb3d8ae7..20f9fd0527 100644
--- a/docs/gimprc.5.in
+++ b/docs/gimprc.5.in
@@ -601,6 +601,12 @@ When enabled, an image will become the active image when its image window
 receives the focus. This is useful for window managers using "click to focus".
  Possible values are yes and no.
 
+.TP
+(space-bar-action pan)
+
+What to do when the space bar is pressed in the image window.  Possible values
+are none, pan and move.
+
 .TP
 (default-threshold 15)
 
diff --git a/etc/gimprc b/etc/gimprc
index 183ebf1068..3c31fbe703 100644
--- a/etc/gimprc
+++ b/etc/gimprc
@@ -462,6 +462,11 @@
 # 
 # (activate-on-focus yes)
 
+# What to do when the space bar is pressed in the image window.  Possible
+# values are none, pan and move.
+# 
+# (space-bar-action pan)
+
 # Tools such as fuzzy-select and bucket fill find regions based on a
 # seed-fill algorithm.  The seed fill starts at the initially selected pixel
 # and progresses in all directions until the difference of pixel intensity
diff --git a/plug-ins/pygimp/Makefile.am b/plug-ins/pygimp/Makefile.am
index 2453200138..62aa9e9747 100644
--- a/plug-ins/pygimp/Makefile.am
+++ b/plug-ins/pygimp/Makefile.am
@@ -141,8 +141,13 @@ pygimp_PYTHON = \
 
 pygimp_DATA = pygimp-logo.png
 
-codegen_files = gimpcolor-types.defs gimpenums-types.defs \
-	gimpui.defs gimpui.override
+codegen_files = \
+	gimpcolor-types.defs	\
+	gimpenums-types.defs	\
+	gimpthumb.defs		\
+	gimpthumb.override	\
+	gimpui.defs		\
+	gimpui.override
 
 pyenvdir = $(gimpplugindir)/environ
 pyinterpdir = $(gimpplugindir)/interpreters