diff --git a/ChangeLog b/ChangeLog
index 9362d9c158..a6a10c45ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2008-08-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtksettings.c: Improve a setting nick: 'aureal' is not really
+	a word, use 'audible' instead.
+
+2008-08-04  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 382291 – Automatically dim the combobox when the model is empty
+
+	* gtk/gtk.symbols:
+	* gtkcombobox.[hc]: Add a GtkComboBox::button-sensitivity
+	property with getter and setter to control the sensitity of
+	empty combo boxes. Patch by Carlos Garnacho, Sven Herzberg,
+	Christian Dywan and others.
+
+	* README.in: Add a note about automatic combobox sensitivity.
+	
 2008-08-04  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/tests/Makefile.am: Skip crossingevents test when
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 24f9de3cc7..3fd7f8cf4f 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -913,7 +913,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
   result = settings_install_property_parser (class,
                                              g_param_spec_boolean ("gtk-enable-input-feedback-sounds",
                                                                    /* Translators: this means sounds that are played as feedback to user input */
-								   P_("Aureal Input Feedback"),
+								   P_("Audible Input Feedback"),
 								   P_("Whether to play event sounds as feedback to user input"),
 								   TRUE,
 								   GTK_PARAM_READWRITE),