diff --git a/kf5-kservice.spec b/kf5-kservice.spec
index f7551f0..aa57741 100644
--- a/kf5-kservice.spec
+++ b/kf5-kservice.spec
@@ -2,7 +2,7 @@
 
 Name:           kf5-%{framework}
 Version:        5.12.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        KDE Frameworks 5 Tier 3 solution for advanced plugin and service introspection
 
 License:        GPLv2+ and LGPLv2+
@@ -17,6 +17,9 @@ URL:            http://www.kde.org
 %endif
 Source0:        http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz
 
+# Fedora customizations to the menu categories
+Patch0:         kservice-5.12.0-xdg-menu.patch
+
 BuildRequires:  kf5-rpm-macros
 BuildRequires:  extra-cmake-modules
 BuildRequires:  qt5-qtbase-devel
@@ -47,6 +50,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n %{framework}-%{version}
+%patch0 -p1 -b .xdg-menu
 
 
 %build
@@ -90,6 +94,9 @@ mkdir -p %{buildroot}%{_kf5_datadir}/kservicetypes5
 
 
 %changelog
+* Sat Aug 15 2015 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.12.0-2
+- forward-port our xdg-menu patch from kdelibs 4
+
 * Fri Jul 10 2015 Rex Dieter <rdieter@fedoraproject.org> - 5.12.0-1
 - 5.12.0
 
diff --git a/kservice-5.12.0-xdg-menu.patch b/kservice-5.12.0-xdg-menu.patch
new file mode 100644
index 0000000..7388535
--- /dev/null
+++ b/kservice-5.12.0-xdg-menu.patch
@@ -0,0 +1,75 @@
+diff -ur kservice-5.12.0/src/kbuildsycoca/applications.menu kservice-5.12.0-xdg-menu/src/kbuildsycoca/applications.menu
+--- kservice-5.12.0/src/kbuildsycoca/applications.menu	2015-07-05 11:13:00.000000000 +0200
++++ kservice-5.12.0-xdg-menu/src/kbuildsycoca/applications.menu	2015-08-16 00:29:20.823019434 +0200
+@@ -31,29 +31,31 @@
+ 					<Category>Core</Category>
+ 					<Not><Category>KDE</Category></Not>
+ 				</And>
++				<Category>X-Red-Hat-Base</Category>
+ 				<!-- Don't list SUSE's YaST in here -->
+ 				<Category>X-SuSE-YaST</Category>
+-				<Category>X-KDE-settings-hardware</Category>
+-				<Category>X-KDE-settings-accessibility</Category>
+-				<Category>X-KDE-settings-components</Category>
+-				<Category>X-KDE-settings-desktop</Category>
+-				<Category>X-KDE-settings-looknfeel</Category>
+-				<Category>X-KDE-settings-network</Category>
+-				<Category>X-KDE-settings-webbrowsing</Category>
+-				<Category>X-KDE-settings-peripherals</Category>
+-				<Category>X-KDE-settings-hardware</Category>
+-				<Category>X-KDE-settings-power</Category>
+-				<Category>X-KDE-settings-security</Category>
+-				<Category>X-KDE-settings-sound</Category>
+-				<Category>X-KDE-settings-system</Category>
+-				<Category>X-KDE-information</Category>
+-				<Filename>kde-kcm_knetworkconfmodule_ss.desktop</Filename>
+-				<Filename>kde-medianotifications.desktop</Filename>
+-				<Filename>kde-audioencoding.desktop</Filename>
+ 			</Not>
+ 		</Include>
+ 	</Menu>
+ 	<Menu>
++		<Name>System Settings</Name>
++		<Directory>SystemConfig.directory</Directory>
++		<Include>
++			<And>
++				<Category>System</Category>
++				<Category>Settings</Category>
++				<Not><Category>X-Red-Hat-ServerConfig</Category></Not>
++			</And>
++		</Include>
++		<Menu>
++			<Name>Server</Name>
++			<Directory>ServerConfig.directory</Directory>
++			<Include>
++				<Category>X-Red-Hat-ServerConfig</Category>
++			</Include>
++		</Menu>
++	</Menu>
++	<Menu>
+ 		<Name>Development</Name>
+ 		<Directory>kf5-development.directory</Directory>
+ 		<Menu>
+@@ -369,7 +371,11 @@
+ 		<Name>Settingsmenu</Name>
+ 		<Directory>kf5-settingsmenu.directory</Directory>
+ 		<Include>
+-			<Category>Settings</Category>
++			<And>
++				<Category>Settings</Category>
++				<Not><Category>System</Category></Not>
++				<Not><Category>X-Red-Hat-ServerConfig</Category></Not>
++			</And>
+ 		</Include>
+ 	</Menu>
+ 	<Menu>
+@@ -378,7 +384,9 @@
+ 		<Include>
+ 			<And>
+ 				<Category>System</Category>
++				<Not><Category>Settings</Category></Not>
+ 				<Not><Category>X-KDE-More</Category></Not>
++				<Not><Category>X-Red-Hat-ServerConfig</Category></Not>
+ 			</And>
+ 		</Include>
+ 		<Menu>