diff --git a/ChangeLog b/ChangeLog
index 4aeba67eae..9c0875aec1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-02-01  Sven Neumann  <sven@gimp.org>
+
+	* app/widgets/gimpprogressbox.c: ellipsize progress label.
+
+	* app/widgets/gimpprogressdialog.c: set a fixed width for progress
+	dialogs.
+
+	* libgimp/gimpprogressbar.c: ellipsize progress label.
+
 2007-02-01  Sven Neumann  <sven@gimp.org>
 
 	* app/config/gimpdisplayconfig.c
diff --git a/app/widgets/gimpprogressbox.c b/app/widgets/gimpprogressbox.c
index 142aaa9a9d..ead9240d4c 100644
--- a/app/widgets/gimpprogressbox.c
+++ b/app/widgets/gimpprogressbox.c
@@ -63,6 +63,21 @@ gimp_progress_box_class_init (GimpProgressBoxClass *klass)
 static void
 gimp_progress_box_init (GimpProgressBox *box)
 {
+  gtk_box_set_spacing (GTK_BOX (box), 6);
+
+  box->progress = gtk_progress_bar_new ();
+  gtk_widget_set_size_request (box->progress, 250, 20);
+  gtk_box_pack_start (GTK_BOX (box), box->progress, FALSE, FALSE, 0);
+  gtk_widget_show (box->progress);
+
+  box->label = gtk_label_new ("");
+  gtk_label_set_ellipsize (GTK_LABEL (box->label), PANGO_ELLIPSIZE_MIDDLE);
+  gtk_misc_set_alignment (GTK_MISC (box->label), 0.0, 0.5);
+  gimp_label_set_attributes (GTK_LABEL (box->label),
+                             PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC,
+                             -1);
+  gtk_box_pack_start (GTK_BOX (box), box->label, FALSE, FALSE, 0);
+  gtk_widget_show (box->label);
 }
 
 static void
@@ -188,24 +203,5 @@ gimp_progress_box_progress_pulse (GimpProgress *progress)
 GtkWidget *
 gimp_progress_box_new (void)
 {
-  GimpProgressBox *box;
-
-  box = g_object_new (GIMP_TYPE_PROGRESS_BOX,
-                      "spacing", 6,
-                      NULL);
-
-  box->progress = gtk_progress_bar_new ();
-  gtk_widget_set_size_request (box->progress, 250, 20);
-  gtk_box_pack_start (GTK_BOX (box), box->progress, FALSE, FALSE, 0);
-  gtk_widget_show (box->progress);
-
-  box->label = gtk_label_new ("");
-  gtk_misc_set_alignment (GTK_MISC (box->label), 0.0, 0.5);
-  gimp_label_set_attributes (GTK_LABEL (box->label),
-                             PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC,
-                             -1);
-  gtk_box_pack_start (GTK_BOX (box), box->label, FALSE, FALSE, 0);
-  gtk_widget_show (box->label);
-
-  return GTK_WIDGET (box);
+  return g_object_new (GIMP_TYPE_PROGRESS_BOX, NULL);
 }
diff --git a/app/widgets/gimpprogressdialog.c b/app/widgets/gimpprogressdialog.c
index c414f95955..7543052fb6 100644
--- a/app/widgets/gimpprogressdialog.c
+++ b/app/widgets/gimpprogressdialog.c
@@ -35,6 +35,9 @@
 #include "gimp-intl.h"
 
 
+#define PROGRESS_DIALOG_WIDTH  400
+
+
 static void    gimp_progress_dialog_progress_iface_init (GimpProgressInterface *iface);
 
 static void     gimp_progress_dialog_response           (GtkDialog    *dialog,
@@ -85,6 +88,8 @@ gimp_progress_dialog_init (GimpProgressDialog *dialog)
   gtk_dialog_add_button (GTK_DIALOG (dialog),
                          GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
+
+  gtk_widget_set_size_request (GTK_WIDGET (dialog), PROGRESS_DIALOG_WIDTH, -1);
 }
 
 static void
diff --git a/libgimp/gimpprogressbar.c b/libgimp/gimpprogressbar.c
index 38c9841ff1..cbf83cebfe 100644
--- a/libgimp/gimpprogressbar.c
+++ b/libgimp/gimpprogressbar.c
@@ -72,6 +72,7 @@ gimp_progress_bar_init (GimpProgressBar *bar)
   GimpProgressVtable vtable = { 0, };
 
   gtk_progress_bar_set_text (GTK_PROGRESS_BAR (bar), " ");
+  gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR (bar), PANGO_ELLIPSIZE_END);
 
   vtable.start      = gimp_progress_bar_start;
   vtable.end        = gimp_progress_bar_end;