diff --git a/qubes-backup-restore.desktop b/qubes-backup-restore.desktop
index 3983f9f4..2597d4e6 100644
--- a/qubes-backup-restore.desktop
+++ b/qubes-backup-restore.desktop
@@ -6,4 +6,4 @@ Terminal=false
 Name=Restore Backup
 GenericName=Restore Backup
 StartupNotify=false
-Categories=System;
+Categories=Settings;X-XFCE-SettingsDialog
diff --git a/qubes-backup.desktop b/qubes-backup.desktop
index 7e932471..55df6c5e 100644
--- a/qubes-backup.desktop
+++ b/qubes-backup.desktop
@@ -6,4 +6,4 @@ Terminal=false
 Name=Backup Qubes
 GenericName=Backup Qubes
 StartupNotify=false
-Categories=System;
+Categories=Settings;X-XFCE-SettingsDialog
diff --git a/qubes-global-settings.desktop b/qubes-global-settings.desktop
index 74a0d537..b92f2c41 100644
--- a/qubes-global-settings.desktop
+++ b/qubes-global-settings.desktop
@@ -6,4 +6,4 @@ Terminal=false
 Name=Qubes Global Settings
 GenericName=Qubes Global Settings
 StartupNotify=false
-Categories=System;
+Categories=Settings;X-XFCE-SettingsDialog
diff --git a/qubes-qube-manager.desktop b/qubes-qube-manager.desktop
index 220f8d58..9e5edb9a 100644
--- a/qubes-qube-manager.desktop
+++ b/qubes-qube-manager.desktop
@@ -6,4 +6,4 @@ Terminal=false
 Name=Qube Manager
 GenericName=Qube Manager
 StartupNotify=false
-Categories=System;
+Categories=Settings;X-XFCE-SettingsDialog
diff --git a/qubes-template-manager.desktop b/qubes-template-manager.desktop
index a0eca51d..108d23e6 100644
--- a/qubes-template-manager.desktop
+++ b/qubes-template-manager.desktop
@@ -6,4 +6,4 @@ Terminal=false
 Name=Qubes Template Manager
 GenericName=Qubes Template Manager
 StartupNotify=false
-Categories=System;
+Categories=Settings;X-XFCE-SettingsDialog
diff --git a/qubes-tools.directory b/qubes-tools.directory
new file mode 100644
index 00000000..f395605e
--- /dev/null
+++ b/qubes-tools.directory
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Directory
+Icon=qubes-manager
+
+Name=Qubes Tools
+GenericName=Qubes Tools
\ No newline at end of file
diff --git a/qubes-tools.menu b/qubes-tools.menu
new file mode 100644
index 00000000..c8b4cd22
--- /dev/null
+++ b/qubes-tools.menu
@@ -0,0 +1,17 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+"http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">
+<Menu>
+    <Name>Applications</Name>
+        <Menu>
+          <Name>Qubes Tools</Name>
+          <Directory>qubes-tools.directory</Directory>
+          <Include>
+            <Filename>qubes-vm-create.desktop</Filename>
+            <Filename>qubes-backup.desktop</Filename>
+            <Filename>qubes-backup-restore.desktop</Filename>
+            <Filename>qubes-global-settings.desktop</Filename>
+            <Filename>qubes-qube-manager.desktop</Filename>
+            <Filename>qubes-template-manager.desktop</Filename>
+          </Include>
+        </Menu>
+</Menu>
diff --git a/qubes-vm-create.desktop b/qubes-vm-create.desktop
index 1fa0d7bc..b5d70281 100644
--- a/qubes-vm-create.desktop
+++ b/qubes-vm-create.desktop
@@ -7,4 +7,4 @@ Terminal=false
 Name=Create Qubes VM
 GenericName=Create Qubes VM
 StartupNotify=false
-Categories=System;X-Xfce-Toplevel;
+Categories=Settings;X-XFCE-SettingsDialog
diff --git a/rpm_spec/qmgr.spec.in b/rpm_spec/qmgr.spec.in
index 65adced0..5277e85f 100644
--- a/rpm_spec/qmgr.spec.in
+++ b/rpm_spec/qmgr.spec.in
@@ -51,6 +51,12 @@ cp qubes-backup-restore.desktop $RPM_BUILD_ROOT/usr/share/applications/
 cp qubes-qube-manager.desktop $RPM_BUILD_ROOT/usr/share/applications/
 cp qubes-template-manager.desktop $RPM_BUILD_ROOT/usr/share/applications/
 
+mkdir -p $RPM_BUILD_ROOT/usr/share/desktop-directories/
+cp qubes-tools.directory $RPM_BUILD_ROOT/usr/share/desktop-directories/
+
+mkdir -p $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged/
+cp qubes-tools.menu $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged/
+
 %post
 update-desktop-database &> /dev/null || :
 
@@ -136,6 +142,8 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/applications/qubes-backup-restore.desktop
 /usr/share/applications/qubes-qube-manager.desktop
 /usr/share/applications/qubes-template-manager.desktop
+/usr/share/desktop-directories/qubes-tools.directory
+/etc/xdg/menus/applications-merged/qubes-tools.menu
 
 %changelog
 @CHANGELOG@