--- xfdesktop-4.6.0.orig/modules/menu/menu-data/xfce-applications.menu	2009-01-12 23:03:21.000000000 +0100
+++ xfdesktop-4.6.0/modules/menu/menu-data/xfce-applications.menu	2009-04-13 21:36:32.000000000 +0200
@@ -18,7 +18,8 @@
         <Filename>xfce4-file-manager.desktop</Filename>
         <Filename>xfce4-web-browser.desktop</Filename>
         <Separator/>
-        <Menuname>Settings</Menuname>
+        <Menuname>Preferences</Menuname>
+        <Menuname>Administration</Menuname>
         <Separator/>
         <Merge type="all"/>
         <Separator/>
@@ -28,10 +29,16 @@
     </Layout>
     
     <Menu>
-        <Name>Settings</Name>
-        <Directory>xfce-settings.directory</Directory>
+        <Name>Preferences</Name>
+        <Directory>Settings.directory</Directory>
         <Include>
-            <Category>Settings</Category>
+            <And>
+                <Category>Settings</Category>
+                <Not><Category>System</Category></Not>
+                <Not><Category>Screensaver</Category></Not>
+                <Not><Filename>fedora-im-chooser.desktop</Filename></Not>
+                <Not><Filename>gnome-default-applications.desktop</Filename></Not>
+            </And>
         </Include>
         
         <Layout>
@@ -40,25 +47,29 @@
             <Merge type="all"/>
         </Layout>
         
-        <Menu>
-            <Name>Screensavers</Name>
-            <Directory>xfce-screensavers.directory</Directory>
-            <Include>
-                <Category>Screensaver</Category>
-            </Include>
-        </Menu>
+    </Menu>
+
+    <Menu>
+        <Name>Administration</Name>
+        <Directory>SystemConfig.directory</Directory>
+        <Include>
+            <And>
+                <Category>Settings</Category>
+                <Category>System</Category>
+                <Not><Category>Screensaver</Category></Not>
+            </And>
+        </Include>
+        
     </Menu>
     
     <Menu>
         <Name>Accessories</Name>
         <Directory>xfce-accessories.directory</Directory>
         <Include>
-            <Or>
-                <Category>Accessibility</Category>
-                <Category>Core</Category>
-                <Category>Legacy</Category>
+            <And>
                 <Category>Utility</Category>
-            </Or>
+                <Not><Category>System</Category></Not>
+            </And>
         </Include>
     </Menu>
     
@@ -124,7 +135,11 @@
         <Name>System</Name>
         <Directory>xfce-system.directory</Directory>
         <Include>
-            <Category>System</Category>
+            <And>
+                <Category>System</Category>
+                <Not><Category>Settings</Category></Not>
+                <Not><Category>Screensaver</Category></Not>
+            </And>
         </Include>
     </Menu>
     
@@ -133,7 +148,13 @@
         <Directory>xfce-other.directory</Directory>
         <OnlyUnallocated/>
         <Include>
-            <All/>
+            <And>
+                <Not><Category>Core</Category></Not>
+                <Not><Category>Settings</Category></Not>
+                <Not><Category>SystemSetup</Category></Not>
+                <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
+                <Not><Category>Screensaver</Category></Not>
+            </And>
         </Include>
     </Menu>