diff --git a/debian/changelog b/debian/changelog
index 83243f8..2d2bd85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
 lubuntu-default-settings (0.17) UNRELEASED; urgency=low
 
+  [ Julien Lavergne ]
   * etc/xdg/lubuntu/menus/lxde-applications.menu:
    - Add a specific menu structure for lubuntu session.
 
- -- Julien Lavergne <gilir@ubuntu.com>  Sat, 11 Dec 2010 17:56:20 +0100
+  [ Jonathan Marsden ]
+  * etc/xdg/lubuntu/menus/lxde-applications.menu:
+   - Update DTD to use standards.freedesktop.org
+   - Move system-wide admin tools to System -> Administration menu
+     (LP: #650432)
+  
+ -- Julien Lavergne <gilir@ubuntu.com>  Sat, 12 Feb 2011 21:26:03 -0800
 
 lubuntu-default-settings (0.16) natty; urgency=low
 
diff --git a/debian/rules b/debian/rules
old mode 100644
new mode 100755
diff --git a/etc/xdg/lubuntu/menus/lxde-applications.menu b/etc/xdg/lubuntu/menus/lxde-applications.menu
index edc6bfb..0e08646 100644
--- a/etc/xdg/lubuntu/menus/lxde-applications.menu
+++ b/etc/xdg/lubuntu/menus/lxde-applications.menu
@@ -1,5 +1,5 @@
 <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
-  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+  "http://standards.freedesktop.org/menu-spec/1.0/menu.dtd">
 
 <Menu>
     <Name>Lubuntu</Name>
@@ -104,17 +104,36 @@
         </Include>
     </Menu>
 
+    <!-- System-->
     <Menu>
         <Name>System</Name>
-        <Directory>lxde-system-tools.directory</Directory>
-        <Include>
-            <And>
-                <Category>System</Category>
-                <Not><Category>Settings</Category></Not>
-                <Not><Category>PackageManager</Category></Not>
-            </And>
-        </Include>
-    </Menu>
+        <Directory>lxde-system.directory</Directory>
+
+        <!-- System Administration-->
+        <Menu>
+            <Name>System Administration</Name>
+            <Directory>lxde-settings-system.directory</Directory>
+            <Include>
+                <And>
+                    <Category>System</Category>
+                    <Category>Settings</Category>
+                </And>
+            </Include>
+        </Menu>     <!-- End System Administration -->
+
+        <!-- System Tools-->
+        <Menu>
+            <Name>SystemTools</Name>
+            <Directory>lxde-system-tools.directory</Directory>
+            <Include>
+                <And>
+                    <Category>System</Category>
+                    <Not><Category>Settings</Category></Not>
+                    <Not><Category>PackageManager</Category></Not>
+                </And>
+            </Include>
+        </Menu>     <!-- End System Tools -->
+    </Menu>     <!-- End System -->
 
     <Menu>
         <Name>Other</Name>
@@ -136,11 +155,13 @@
         <Directory>lxde-settings.directory</Directory>
         <OnlyUnallocated/>
         <Include>
+            <And>
             <Or>
                 <Category>Settings</Category>
                 <Category>PackageManager</Category>
-                <Category>System</Category>
             </Or>
+                <Not><Category>System</Category></Not>
+            </And>
         </Include>
         <Layout>
             <Merge type="menus"/>