diff --git a/ChangeLog b/ChangeLog
index c90ce1436d3a44fd73624d593641aaeb958eb1e7..09dd22e7b64adc0c5086f2ba6ac4c593cff755a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-25  Sven Neumann  <sven@gimp.org>
+
+	* plug-ins/common/max_rgb.c: moved it back, the plug-in changes
+	the image. Renamed to "Maximum RGB".
+
 2005-09-25  Carol Spears  <carol@gimp.org>
 
 	* plug-ins/common/max_rgb.c moved menu entry from Colors to
@@ -10,8 +15,7 @@
         added it to Filters/Web
 
 	* plug-ins/pygimp/plug-ins/py-slice.py added the patch from
-        Joao S. O. Bueno Calligaris that was attached to 
-        http://bugzilla.gnome.org/show_bug.cgi?id=159564
+        Joao S. O. Bueno Calligaris that was attached to bug #159564.
 
 2005-09-25  Michael Natterer  <mitch@gimp.org>
 
diff --git a/plug-ins/common/max_rgb.c b/plug-ins/common/max_rgb.c
index 395a4edf5fda4464c2cd373e85afaa4ac3a33c2f..e77fff08558ade58a31cec8a1c0d7b2b045c54d1 100644
--- a/plug-ins/common/max_rgb.c
+++ b/plug-ins/common/max_rgb.c
@@ -91,17 +91,17 @@ query (void)
                           "the channel that has the maximum value in three "
                           "(red, green, blue) channels, and other channels "
                           "are zero-cleared",
-                          "the help is not yet written for this plug-in since none is needed.",
+                          "There's no help yet.",
                           "Shuji Narazaki (narazaki@InetQ.or.jp)",
                           "Shuji Narazaki",
                           "May 2000",
-                          N_("_Max RGB..."),
+                          N_("_Maximum RGB..."),
                           "RGB*",
                           GIMP_PLUGIN,
                           G_N_ELEMENTS (args), 0,
                           args, NULL);
 
-  gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors/Info");
+  gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors");
 }
 
 static void
@@ -259,7 +259,7 @@ max_rgb_dialog (GimpDrawable *drawable)
 
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
-  dialog = gimp_dialog_new (_("Max RGB"), PLUG_IN_BINARY,
+  dialog = gimp_dialog_new (_("Maximum RGB Value"), PLUG_IN_BINARY,
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,