diff --git a/ChangeLog b/ChangeLog
index 021122f338..695b18f27b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-08-04  Henrik Brix Andersen  <brix@gimp.org>
+
+	* app/gui/plug-in-menus.c (plug_in_menus_update)
+	* app/plug-in/plug-in.c (plug_in_get_undo_desc): use
+	gimp_menu_path_strip_uline() to strip plug-in mnemonics from
+	undo/redo, repeat and re-show menu entries
+
 2003-08-04  Henrik Brix Andersen  <brix@gimp.org>
 
 	* plug-ins/pygimp/plug-ins/sphere.py
diff --git a/app/gui/plug-in-menus.c b/app/gui/plug-in-menus.c
index abc58378f3..9cb5c44656 100644
--- a/app/gui/plug-in-menus.c
+++ b/app/gui/plug-in-menus.c
@@ -342,6 +342,7 @@ plug_in_menus_update (GimpItemFactory *item_factory,
             {
               const gchar *progname;
               const gchar *path;
+              gchar       *stripped;
               gchar       *basename;
               gchar       *ellipses;
               gchar       *repeat;
@@ -353,7 +354,10 @@ plug_in_menus_update (GimpItemFactory *item_factory,
                                                        progname, NULL),
                                proc_def->menu_path);
 
-              basename = g_path_get_basename (path);
+              stripped = gimp_menu_path_strip_uline (path);
+              basename = g_path_get_basename (stripped);
+
+              g_free (stripped);
 
               ellipses = strstr (basename, "...");
 
diff --git a/app/menus/plug-in-menus.c b/app/menus/plug-in-menus.c
index abc58378f3..9cb5c44656 100644
--- a/app/menus/plug-in-menus.c
+++ b/app/menus/plug-in-menus.c
@@ -342,6 +342,7 @@ plug_in_menus_update (GimpItemFactory *item_factory,
             {
               const gchar *progname;
               const gchar *path;
+              gchar       *stripped;
               gchar       *basename;
               gchar       *ellipses;
               gchar       *repeat;
@@ -353,7 +354,10 @@ plug_in_menus_update (GimpItemFactory *item_factory,
                                                        progname, NULL),
                                proc_def->menu_path);
 
-              basename = g_path_get_basename (path);
+              stripped = gimp_menu_path_strip_uline (path);
+              basename = g_path_get_basename (stripped);
+
+              g_free (stripped);
 
               ellipses = strstr (basename, "...");
 
diff --git a/app/plug-in/gimpplugin.c b/app/plug-in/gimpplugin.c
index 2aab09ebd1..19560596e6 100644
--- a/app/plug-in/gimpplugin.c
+++ b/app/plug-in/gimpplugin.c
@@ -85,6 +85,8 @@
 #include "gui/palette-select.h"
 #include "gui/pattern-select.h"
 
+#include "widgets/gimpwidgets-utils.h"
+
 #include "plug-in.h"
 #include "plug-ins.h"
 #include "plug-in-debug.h"
@@ -884,6 +886,7 @@ gchar *
 plug_in_get_undo_desc (PlugIn *plug_in)
 {
   PlugInProcDef *proc_def;
+  gchar         *stripped;
   gchar         *undo_desc;
 
   g_return_val_if_fail (plug_in != NULL, NULL);
@@ -906,7 +909,9 @@ plug_in_get_undo_desc (PlugIn *plug_in)
                                                plug_in->prog, NULL),
                        proc_def->menu_path);
 
-      undo_desc = g_path_get_basename (path);
+      stripped  = gimp_menu_path_strip_uline (path);
+      undo_desc = g_path_get_basename (stripped);
+      g_free (stripped);
 
       ellipses = strstr (undo_desc, "...");
 
diff --git a/app/plug-in/plug-in.c b/app/plug-in/plug-in.c
index 2aab09ebd1..19560596e6 100644
--- a/app/plug-in/plug-in.c
+++ b/app/plug-in/plug-in.c
@@ -85,6 +85,8 @@
 #include "gui/palette-select.h"
 #include "gui/pattern-select.h"
 
+#include "widgets/gimpwidgets-utils.h"
+
 #include "plug-in.h"
 #include "plug-ins.h"
 #include "plug-in-debug.h"
@@ -884,6 +886,7 @@ gchar *
 plug_in_get_undo_desc (PlugIn *plug_in)
 {
   PlugInProcDef *proc_def;
+  gchar         *stripped;
   gchar         *undo_desc;
 
   g_return_val_if_fail (plug_in != NULL, NULL);
@@ -906,7 +909,9 @@ plug_in_get_undo_desc (PlugIn *plug_in)
                                                plug_in->prog, NULL),
                        proc_def->menu_path);
 
-      undo_desc = g_path_get_basename (path);
+      stripped  = gimp_menu_path_strip_uline (path);
+      undo_desc = g_path_get_basename (stripped);
+      g_free (stripped);
 
       ellipses = strstr (undo_desc, "...");