diff --git a/ChangeLog b/ChangeLog
index 8a6154adf0..efcf1ec59e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-06-25  Sven Neumann  <sven@gimp.org>
+
+	* app/dialogs/preferences-dialog.c: relabel the profile used for
+	softproofing to "Print simulation profile".
+
+	* libgimpconfig/gimpcolorconfig.c: improved blurb.
+	
+	* modules/cdisplay_lcms.c (cdisplay_lcms_configure): show filenames
+	of profiles; will be replaced by real profile information.
+
 2005-06-25  Sven Neumann  <sven@gimp.org>
 
 	* libgimpwidgets/Makefile.am
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index cb68b72907..281aa34e1d 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -2166,7 +2166,7 @@ prefs_dialog_new (Gimp       *gimp,
         N_("Select CMYK color profile"),    "cmyk-profile"    },
       { N_("_Monitor profile:"),
         N_("Select monitor color profile"), "display-profile" },
-      { N_("_Printer profile:"),
+      { N_("_Print simulation profile:"),
         N_("Select printer color profile"), "printer-profile" }
     };
 
diff --git a/libgimpconfig/gimpcolorconfig.c b/libgimpconfig/gimpcolorconfig.c
index b62c2953f8..8a9a6662b5 100644
--- a/libgimpconfig/gimpcolorconfig.c
+++ b/libgimpconfig/gimpcolorconfig.c
@@ -53,7 +53,8 @@
 #define DISPLAY_RENDERING_INTENT_BLURB \
   N_("Sets how colors are mapped for your display.")
 #define SIMULATION_RENDERING_INTENT_BLURB \
-  N_("Sets how colors are converted from workspace to simulation device.")
+  N_("Sets how colors are converted from workspace to the print simulation " \
+     "device.")
 
 #define OPEN_BEHAVIOUR_NO_PROFILE_BLURB \
   "Defines what will be done if no color profile is available."
diff --git a/modules/cdisplay_lcms.c b/modules/cdisplay_lcms.c
index bae04a9630..76a7e4b493 100644
--- a/modules/cdisplay_lcms.c
+++ b/modules/cdisplay_lcms.c
@@ -264,7 +264,7 @@ cdisplay_lcms_configure (GimpColorDisplay *display)
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
   gtk_widget_show (label);
 
-  table = gtk_table_new (1, 2, FALSE);
+  table = gtk_table_new (5, 2, FALSE);
   gtk_table_set_row_spacings (GTK_TABLE (table), 6);
   gtk_table_set_col_spacings (GTK_TABLE (table), 6);
   gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
@@ -274,8 +274,30 @@ cdisplay_lcms_configure (GimpColorDisplay *display)
   gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
                              _("Mode of operation:"),
                              0.0, 0.5, label, 1, TRUE);
+  {
+    static const struct
+    {
+      const gchar *text;
+      const gchar *property_name;
+    }
+    profiles[] =
+    {
+      { N_("RGB profile:"),              "rgb-profile"     },
+      { N_("CMYK profile:"),             "cmyk-profile"    },
+      { N_("Monitor profile:"),          "display-profile" },
+      { N_("Print simulation profile:"), "printer-profile" }
+    };
 
-  /* more to come here */
+    gint i;
+
+    for (i = 0, row = 3; i < G_N_ELEMENTS (profiles); i++, row++)
+      {
+        label = gimp_prop_label_new (config, profiles[i].property_name);
+        gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                                   profiles[i].text,
+                                   0.0, 0.5, label, 1, TRUE);
+      }
+  }
 
   return vbox;
 }