diff -uprN mate-menus/layout/Makefile.am mate-menus-test/layout/Makefile.am
--- mate-menus/layout/Makefile.am	2015-12-27 14:57:06.826583505 +0100
+++ mate-menus-test/layout/Makefile.am	2015-12-27 14:53:42.736508000 +0100
@@ -2,7 +2,8 @@ menudir = $(sysconfdir)/xdg/menus
 
 menu_DATA = \
 	mate-applications.menu \
-	mate-settings.menu
+	mate-settings.menu \
+	mate-preferences-categories.menu
 
 EXTRA_DIST= $(menu_DATA)
 
diff -uprN mate-menus/layout/mate-preferences-categories.menu mate-menus-test/layout/mate-preferences-categories.menu
--- mate-menus/layout/mate-preferences-categories.menu	1970-01-01 01:00:00.000000000 +0100
+++ mate-menus-test/layout/mate-preferences-categories.menu	2015-11-04 00:05:08.747668000 +0100
@@ -0,0 +1,114 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+
+<Menu>
+  <Name>Preferences</Name>
+ 
+  <Menu>
+    <Name>Personal</Name>
+    <Directory>mate-personal.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Category>X-MATE-PersonalSettings</Category>
+        <Not><Category>System</Category></Not>
+      </And>
+      <And>
+        <Category>Settings</Category>
+        <Category>X-GNOME-PersonalSettings</Category>
+        <Not><Category>System</Category></Not>
+      </And>
+      <And>
+        <Category>Settings</Category>
+        <Category>X-GNOME-SystemSettings</Category>
+        <Category>Archiving</Category>
+      </And>
+      <And>
+        <Category>Settings</Category>
+        <Category>Accessibility</Category>
+      </And>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Look and Feel</Name>
+    <Directory>mate-look-and-feel.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Category>DesktopSettings</Category>
+        <Not><Category>System</Category></Not>
+        <Not><Category>Security</Category></Not>
+      </And>
+      <And>
+        <Category>Settings</Category>
+        <Category>Qt</Category>
+        <Not><Category>System</Category></Not>
+        <Not><Category>Security</Category></Not>
+      </And>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Internet and Network</Name>
+    <Directory>mate-internet-and-network.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Category>X-MATE-NetworkSettings</Category>
+        <Not><Category>System</Category></Not>
+      </And>
+      <And>
+        <Category>Settings</Category>
+        <Category>X-GNOME-NetworkSettings</Category>
+        <Not><Category>System</Category></Not>
+      </And>
+      <And>
+        <Category>Settings</Category>
+        <Category>Security</Category>
+        <Not><Category>System</Category></Not>
+      </And>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Hardware</Name>
+    <Directory>mate-hardware.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Category>HardwareSettings</Category>
+        <Not><Category>System</Category></Not>
+      </And>
+    </Include>
+  </Menu>
+
+  <Menu>
+    <Name>Other</Name>
+    <Directory>mate-other.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Not><Category>Accessibility</Category></Not>
+        <Not><Category>System</Category></Not>
+        <Not><Category>DesktopSettings</Category></Not>
+        <Not><Category>HardwareSettings</Category></Not>
+        <Not><Category>Security</Category></Not>
+        <Not><Category>Archiving</Category></Not>
+        <Not><Category>Qt</Category></Not>
+        <Not><Category>X-MATE-NetworkSettings</Category></Not>
+        <Not><Category>X-GNOME-NetworkSettings</Category></Not>
+        <Not><Category>X-MATE-PersonalSettings</Category></Not>
+        <Not><Category>X-GNOME-PersonalSettings</Category></Not>
+      </And>
+    </Include>
+    <Exclude>
+      <Filename>matecc.desktop</Filename>
+    </Exclude>
+  </Menu>
+
+  <Exclude>
+    <Category>Settings</Category>
+  </Exclude>
+</Menu>
+