diff --git a/src/ChangeLog b/src/ChangeLog
index fa80f58e10b..e7fe56fbafa 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-31  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* gtkutil.c (update_frame_tool_bar): Initialize wbutton to NULL.
+
 2007-08-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* frame.h:
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 2af1e03cc28..5333f550751 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -3810,7 +3810,7 @@ update_frame_tool_bar (f)
       GtkStockItem stock_item;
       char *stock_name = NULL;
       Lisp_Object rtl;
-      GtkWidget *wbutton;
+      GtkWidget *wbutton = NULL;
       GtkWidget *weventbox;
       Lisp_Object func = intern ("x-gtk-map-stock");