diff --git a/ChangeLog b/ChangeLog
index ab45613e69..592d5214e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-26  Michael Natterer  <mitch@gimp.org>
+
+	* libgimpwidgets/gimpbutton.c (gimp_button_clicked): chain up if a
+	parent impl exists to be safe against future gtk versions doing
+	something in GtkButton::clicked() (as happened in GTK+ trunk).
+
 2009-01-26  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/common/curve-bend.c (p_load_pointfile): check the
diff --git a/libgimpwidgets/gimpbutton.c b/libgimpwidgets/gimpbutton.c
index 3e5492925e..7062e0e294 100644
--- a/libgimpwidgets/gimpbutton.c
+++ b/libgimpwidgets/gimpbutton.c
@@ -132,4 +132,8 @@ gimp_button_clicked (GtkButton *button)
       gimp_button_extended_clicked (GIMP_BUTTON (button),
                                     GIMP_BUTTON (button)->press_state);
     }
+  else if (GTK_BUTTON_CLASS (parent_class)->clicked)
+    {
+      GTK_BUTTON_CLASS (parent_class)->clicked (button);
+    }
 }