diff --git a/ChangeLog b/ChangeLog
index 09dfc24529..c015d376c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-23  Michael Natterer  <mitch@gimp.org>
+
+	* menus/toolbox-menu.xml.in: added placeholder File/Preferences
+	and move the preferences and keyboard shortcut dialogs there.
+
+	* plug-ins/common/uniteditor.c (query): register the unit editor
+	there too.
+
 2007-09-23  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/common/pcx.c: avoid pointer arithmetics on void pointers.
diff --git a/menus/toolbox-menu.xml.in b/menus/toolbox-menu.xml.in
index ef4431e616..df8bc7035c 100644
--- a/menus/toolbox-menu.xml.in
+++ b/menus/toolbox-menu.xml.in
@@ -21,7 +21,10 @@
         <menuitem action="edit-paste-as-new" />
       </menu>
       <separator />
-      <menuitem action="dialogs-preferences" />
+      <placeholder name="Preferences">
+	<menuitem action="dialogs-preferences" />
+	<menuitem action="dialogs-keyboard-shortcuts" />
+      </placeholder>
       <menu action="dialogs-menu" name="Dialogs">
         <menu action="dialogs-new-dock-menu" name="Create New Dock">
           <menuitem action="dialogs-new-dock-lcp" />
diff --git a/plug-ins/common/uniteditor.c b/plug-ins/common/uniteditor.c
index b49a420b77..10c4a92892 100644
--- a/plug-ins/common/uniteditor.c
+++ b/plug-ins/common/uniteditor.c
@@ -153,6 +153,7 @@ query (void)
 			  G_N_ELEMENTS (args), 0,
                           args, NULL);
 
+  gimp_plugin_menu_register (PLUG_IN_PROC, "<Toolbox>/File/Preferences");
   gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Edit/Preferences");
   gimp_plugin_icon_register (PLUG_IN_PROC, GIMP_ICON_TYPE_STOCK_ID,
                              (const guint8 *) GIMP_STOCK_TOOL_MEASURE);