diff --git a/ChangeLog b/ChangeLog
index 76c5bbe869..b48759addd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-10  Sven Neumann  <sven@gimp.org>
+
+	* app/dialogs/preferences-dialog.c: set the padding-mode to custom
+	color if a custom color is choosen. Fixes bug #157844.
+
 2004-11-10  Michael Natterer  <mitch@gimp.org>
 
 	* plug-ins/dbbrowser/plugin-browser.c (browser_dialog_new): fixed
diff --git a/HACKING b/HACKING
index c186a796ab..aaa3a8760b 100644
--- a/HACKING
+++ b/HACKING
@@ -5,7 +5,7 @@ to have the following packages (or newer versions) installed:
 
     * GNU autoconf 2.54
         - ftp://ftp.gnu.org/gnu/autoconf/
-    * GNU automake 1.7  (1.8 and 1.6 will also work)
+    * GNU automake 1.7  (1.9, 1.8 and 1.6 will also work)
         - ftp://ftp.gnu.org/gnu/automake/
     * GNU libtool 1.4  (1.5 if you are compiling on Win32)
         - ftp://ftp.gnu.org/gnu/libtool/
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index f7f102baf9..1ee69fc438 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -1018,6 +1018,14 @@ prefs_memsize_entry_add (GObject      *config,
   return entry;
 }
 
+static void
+prefs_canvas_padding_color_changed (GtkWidget *button,
+                                    GtkWidget *combo)
+{
+  gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (combo),
+                                 GIMP_CANVAS_PADDING_MODE_CUSTOM);
+}
+
 static void
 prefs_display_options_frame_add (Gimp         *gimp,
                                  GObject      *object,
@@ -1028,6 +1036,7 @@ prefs_display_options_frame_add (Gimp         *gimp,
   GtkWidget *hbox;
   GtkWidget *checks_vbox;
   GtkWidget *table;
+  GtkWidget *combo;
   GtkWidget *button;
 
   vbox = prefs_frame_new (label, parent, FALSE);
@@ -1072,9 +1081,10 @@ prefs_display_options_frame_add (Gimp         *gimp,
 
   table = prefs_table_new (2, GTK_CONTAINER (vbox));
 
-  prefs_enum_combo_box_add (object, "padding-mode", 0, 0,
-                            _("Canvas _padding mode:"), GTK_TABLE (table), 0,
-                            NULL);
+  combo = prefs_enum_combo_box_add (object, "padding-mode", 0, 0,
+                                    _("Canvas _padding mode:"),
+                                    GTK_TABLE (table), 0,
+                                    NULL);
 
   button = prefs_color_button_add (object, "padding-color",
                                    _("Custom p_adding color:"),
@@ -1082,6 +1092,10 @@ prefs_display_options_frame_add (Gimp         *gimp,
                                    GTK_TABLE (table), 1, NULL);
   gimp_color_panel_set_context (GIMP_COLOR_PANEL (button),
                                 gimp_get_user_context (gimp));
+
+  g_signal_connect (button, "color_changed",
+                    G_CALLBACK (prefs_canvas_padding_color_changed),
+                    gtk_bin_get_child (GTK_BIN (combo)));
 }
 
 static void