diff --git a/ChangeLog b/ChangeLog
index 0301089f39..4c2ca61144 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-07  Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/gtkcombo.c: (gtk_combo_init):
+	* gtk/gtkcombobox.c: (gtk_combo_box_set_popup_widget),
+	(gtk_combo_box_menu_setup):
+	Set names on the popup widgets to make them themable. (#414975, 
+	Benjamin Berg)
+
 2007-03-07  Michael Natterer  <mitch@imendio.com>
 
 	* gtk/gtkcellrendereraccel.c: use multihead safe ungrab functions
diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c
index 10d10b2991..46f6c8402c 100644
--- a/gtk/gtkcombo.c
+++ b/gtk/gtkcombo.c
@@ -940,6 +940,7 @@ gtk_combo_init (GtkCombo * combo)
 		    G_CALLBACK (gtk_combo_popup_button_leave), combo);
 
   combo->popwin = gtk_window_new (GTK_WINDOW_POPUP);
+  gtk_widget_set_name (combo->popwin, "gtk-combo-popup-window");
   gtk_window_set_type_hint (GTK_WINDOW (combo->popwin), GDK_WINDOW_TYPE_HINT_COMBO);
   g_object_ref (combo->popwin);
   gtk_window_set_resizable (GTK_WINDOW (combo->popwin), FALSE);
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index f6fdb965d3..08eaea135d 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -1262,6 +1262,7 @@ gtk_combo_box_set_popup_widget (GtkComboBox *combo_box,
 	  GtkWidget *toplevel;
 	  
           combo_box->priv->popup_window = gtk_window_new (GTK_WINDOW_POPUP);
+          gtk_widget_set_name (combo_box->priv->popup_window, "gtk-combobox-popup-window");
 
 	  gtk_window_set_type_hint (GTK_WINDOW (combo_box->priv->popup_window),
 				    GDK_WINDOW_TYPE_HINT_COMBO);
@@ -2618,6 +2619,8 @@ gtk_combo_box_menu_setup (GtkComboBox *combo_box,
 
   /* create our funky menu */
   menu = gtk_menu_new ();
+  gtk_widget_set_name (menu, "gtk-combobox-popup-menu");
+  
   g_signal_connect (menu, "key_press_event",
 		    G_CALLBACK (gtk_combo_box_menu_key_press), combo_box);
   gtk_combo_box_set_popup_widget (combo_box, menu);