diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog
index 591cbc58d..a6a4e0e4b 100644
--- a/capplets/sound/ChangeLog
+++ b/capplets/sound/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-03  Jens Granseuer  <jensgr@gmx.net>
+
+	Patch by: Matthias Clasen <mclasen@redhat.com>
+
+	* sound-properties-capplet.c: (setup_default_mixer): ellipsize the
+	device combobox (bug #425650)
+
 2007-03-18  Christian Persch  <chpe@gnome.org>
 
 	* sound-properties.glade: Fix button label alignment. Bug #416238.
diff --git a/capplets/sound/sound-properties-capplet.c b/capplets/sound/sound-properties-capplet.c
index c11e3532a..9190741f2 100644
--- a/capplets/sound/sound-properties-capplet.c
+++ b/capplets/sound/sound-properties-capplet.c
@@ -869,6 +869,7 @@ setup_default_mixer (GladeXML *dialog)
 	g_object_unref (G_OBJECT (model)); 
 
 	renderer = gtk_cell_renderer_text_new ();
+        g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
 	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (device_widget), renderer, TRUE);
 	gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (device_widget), renderer,
 			"text", MIXER_DEVICE_MODEL_NAME_COLUMN);