diff --git a/ChangeLog b/ChangeLog
index abeadc03f5..f8ecf99951 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-06  Michael Natterer  <mitch@gimp.org>
+
+	* libgimpbase/gimputils.c (gimp_strip_uline): restore unescaping
+	of "__"-escaped underlines which was broken since the addition of
+	"(_X)"-stripping.
+
 2006-08-06  Karine Delvare  <edhel@gimp.org>
 
 	* app/tools/gimprectangletool.c: Applied patch from Karl Günter
diff --git a/libgimpbase/gimputils.c b/libgimpbase/gimputils.c
index 7b81a8937a..c37809d0ae 100644
--- a/libgimpbase/gimputils.c
+++ b/libgimpbase/gimputils.c
@@ -262,7 +262,8 @@ gimp_strip_uline (const gchar *str)
           if (str[1] == '_')
             {
              *p++ = *str++;
-             *p++ = *str++;
+             str++;
+             continue;
             }
 
           /*  find the "(_X)" construct and remove it entirely  */