diff --git a/ChangeLog b/ChangeLog
index 534ed4230b..3b1cdcd257 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkcombobox.c (gtk_combo_box_set_model): Emit
+	the notify::model signal.  (#509819, David Zeuthen)
+
 2008-01-15  Michael Natterer  <mitch@imendio.com>
 
 	* gdk/gdkdisplay.h
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 3dc094f82a..7021e71601 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -4913,7 +4913,7 @@ gtk_combo_box_set_model (GtkComboBox  *combo_box,
   gtk_combo_box_unset_model (combo_box);
 
   if (model == NULL)
-    return;
+    goto out;
 
   combo_box->priv->model = model;
   g_object_ref (combo_box->priv->model);
@@ -4953,6 +4953,9 @@ gtk_combo_box_set_model (GtkComboBox  *combo_box,
   if (combo_box->priv->cell_view)
     gtk_cell_view_set_model (GTK_CELL_VIEW (combo_box->priv->cell_view),
                              combo_box->priv->model);
+
+out:
+  g_object_notify (G_OBJECT (combo_box), "model");
 }
 
 /**