diff --git a/ChangeLog b/ChangeLog
index db565e1553..94a5bcd069 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 	* gtk/gtkuimanager.c (update_node): Remove two more places
 	where we were unconditionally setting "visible", causing
 	unnecessary notifications.
+	(update_node): Fix some C99isms.
 
 	* gtk/gtkclipboard.c (gtk_clipboard_get_for_display): 
 	(gtk_clipboard_get): Clarify the docs.  (#156638, Torsten 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index db565e1553..94a5bcd069 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -3,6 +3,7 @@
 	* gtk/gtkuimanager.c (update_node): Remove two more places
 	where we were unconditionally setting "visible", causing
 	unnecessary notifications.
+	(update_node): Fix some C99isms.
 
 	* gtk/gtkclipboard.c (gtk_clipboard_get_for_display): 
 	(gtk_clipboard_get): Clarify the docs.  (#156638, Torsten 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index db565e1553..94a5bcd069 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -3,6 +3,7 @@
 	* gtk/gtkuimanager.c (update_node): Remove two more places
 	where we were unconditionally setting "visible", causing
 	unnecessary notifications.
+	(update_node): Fix some C99isms.
 
 	* gtk/gtkclipboard.c (gtk_clipboard_get_for_display): 
 	(gtk_clipboard_get): Clarify the docs.  (#156638, Torsten 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index db565e1553..94a5bcd069 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -3,6 +3,7 @@
 	* gtk/gtkuimanager.c (update_node): Remove two more places
 	where we were unconditionally setting "visible", causing
 	unnecessary notifications.
+	(update_node): Fix some C99isms.
 
 	* gtk/gtkclipboard.c (gtk_clipboard_get_for_display): 
 	(gtk_clipboard_get): Clarify the docs.  (#156638, Torsten 
diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index 7803248f6f..62804547d4 100644
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -2036,6 +2036,9 @@ update_node (GtkUIManager *self,
   GNode *child;
   GtkAction *action;
   gchar *tooltip;
+  const gchar *action_name;
+  NodeUIReference *ref;
+  
 #ifdef DEBUG_UI_MANAGER
   GList *tmp;
 #endif
@@ -2063,9 +2066,6 @@ update_node (GtkUIManager *self,
   g_print (")\n");
 #endif
 
-  const gchar *action_name;
-  NodeUIReference *ref;
-  
   if (info->uifiles == NULL) {
     /* We may need to remove this node.
      * This must be done in post order