diff --git a/ChangeLog b/ChangeLog
index a026a377d2..a26563f3b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-09-23  Michael Natterer  <mitch@gimp.org>
+
+	* menus/image-menu.xml.in: reordered submenus and placeholders
+	so stuff not grouped that randomly any longer.
+
+	* plug-ins/script-fu/scripts/hsv-graph.scm: move it to the "Info"
+	placeholder so it is next to histogram and ccanalyze.
+
 2005-09-23  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/jpeg/jpeg-save.c: added a tooltip that explains how to
diff --git a/menus/image-menu.xml.in b/menus/image-menu.xml.in
index 968859e088..f9d0479897 100644
--- a/menus/image-menu.xml.in
+++ b/menus/image-menu.xml.in
@@ -438,21 +438,21 @@
       <menuitem action="tools-curves" />
       <menuitem action="tools-posterize" />
       <separator />
-      <menuitem action="drawable-desaturate" />
-      <placeholder name="Invert">
-        <menuitem action="drawable-invert" />
-      </placeholder>
-      <menu action="colors-auto-menu" name="Auto">
-        <menuitem action="drawable-equalize" />
-        <menuitem action="drawable-levels-stretch" />
-      </menu>
-      <separator />
       <placeholder name="Info">
         <menuitem action="dialogs-histogram" />
       </placeholder>
       <separator />
-      <menu action="colors-map-menu" name="Map" />
+      <menu action="colors-auto-menu" name="Auto">
+        <menuitem action="drawable-equalize" />
+        <menuitem action="drawable-levels-stretch" />
+      </menu>
       <menu action="colors-components-menu" name="Components" />
+      <menu action="colors-map-menu" name="Map" />
+      <separator />
+      <menuitem action="drawable-desaturate" />
+      <placeholder name="Invert">
+        <menuitem action="drawable-invert" />
+      </placeholder>
       <separator />
     </menu>
 
diff --git a/plug-ins/script-fu/scripts/hsv-graph.scm b/plug-ins/script-fu/scripts/hsv-graph.scm
index 0402fec50c..556132a3fe 100644
--- a/plug-ins/script-fu/scripts/hsv-graph.scm
+++ b/plug-ins/script-fu/scripts/hsv-graph.scm
@@ -349,4 +349,4 @@
 		    SF-ADJUSTMENT _"End Y" (cons script-fu-hsv-graph-end-y '(0 5000 1 10 0 1)))
 
 (script-fu-menu-register "script-fu-hsv-graph"
-			 "<Image>/Colors")
+			 "<Image>/Colors/Info")