diff --git a/ChangeLog b/ChangeLog
index 84d7df30e9..678bc46e21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-08  Sven Neumann  <sven@gimp.org>
+
+	* app/dialogs/preferences-dialog.c: added GUI for "space-bar-action".
+
 2006-09-08  Michael Natterer  <mitch@gimp.org>
 
 	* app/paint/gimpperspectiveclone.c (gimp_perspective_clone_motion):
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index 6382d61ecb..38500a6ca0 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -1974,6 +1974,16 @@ prefs_dialog_new (Gimp       *gimp,
                                _("Initial zoom _ratio:"),
                                GTK_TABLE (table), 0, size_group);
 
+  /*  Space Bar  */
+  vbox2 = prefs_frame_new (_("Space Bar"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  prefs_enum_combo_box_add (object, "space-bar-action", 0, 0,
+                            _("Action bound to the space bar:"),
+                            GTK_TABLE (table), 0, size_group);
+
   /*  Mouse Pointers  */
   vbox2 = prefs_frame_new (_("Mouse Pointers"),
                            GTK_CONTAINER (vbox), FALSE);