diff --git a/plasma-desktop-obsolete_kickoffrc.patch b/plasma-desktop-obsolete_kickoffrc.patch
deleted file mode 100644
index 4c17744..0000000
--- a/plasma-desktop-obsolete_kickoffrc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -U3 -d -r -N plasma-desktop-5.5.4/desktoppackage/contents/updates/obsolete_kickoffrc.js plasma-desktop-5.5.4.fixed/desktoppackage/contents/updates/obsolete_kickoffrc.js
---- plasma-desktop-5.5.4/desktoppackage/contents/updates/obsolete_kickoffrc.js	2016-01-26 20:39:46.000000000 +0100
-+++ plasma-desktop-5.5.4.fixed/desktoppackage/contents/updates/obsolete_kickoffrc.js	2016-02-14 05:42:50.000000000 +0100
-@@ -1,7 +1,7 @@
- var kickoffConfig = ConfigFile("kickoffrc");
- 
- kickoffConfig.group = "Favorites";
--var favorites = kickoffConfig.readEntry("FavoriteURLs").split(',');
-+var favorites = kickoffConfig.readEntry("FavoriteURLs");
- 
- kickoffConfig.group = "SystemApplications";
- var systemApplications = kickoffConfig.readEntry("DesktopFiles").split(',');
-@@ -18,6 +18,7 @@
- 
-         for (var j in panel.widgetIds) {
-             var widget = panel.widgetById(panel.widgetIds[j]);
-+            widget.currentConfigGroup = ["General"];
- 
-             if (widget.type == "org.kde.plasma.kickoff") {
-                 if (favorites) {
-@@ -36,6 +37,7 @@
- 
-         for (var j in desktop.widgetIds) {
-             var widget = desktop.widgetById(desktop.widgetIds[j]);
-+            widget.currentConfigGroup = ["General"];
- 
-             if (widget.type == "org.kde.plasma.kickoff") {
-                 if (favorites) {
diff --git a/plasma-desktop.spec b/plasma-desktop.spec
index c0b7fec..b978d6b 100644
--- a/plasma-desktop.spec
+++ b/plasma-desktop.spec
@@ -4,7 +4,7 @@
 Name:    plasma-desktop
 Summary: Plasma Desktop shell
 Version: 5.5.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2+ and (GPLv2 or GPLv3)
 URL:     https://projects.kde.org/plasma-desktop
@@ -31,13 +31,14 @@ Patch102: plasma-desktop-fedora_layout.patch
 
 ## upstream patches (master branch)
 Patch519: TaskManager-Don-t-use-Plasma-theme-icons-in-task-ico.patch
+# No 'favorites' in KDE menu
+# https://bugzilla.redhat.com/show_bug.cgi?id=1320395
+Patch520: Set-config-group.patch
+Patch521: Handle-non-existing-kickoffrc-correctly.patch
 
 ## upstreamable patches
 # missing '#include <config-workspace.h>' means PK never used
 Patch50: plasma-desktop-PackageKit.patch
-# No 'favorites' in KDE menu
-# https://bugzilla.redhat.com/show_bug.cgi?id=1320395
-Patch51: plasma-desktop-obsolete_kickoffrc.patch
 
 BuildRequires:  libusb-devel
 BuildRequires:  fontconfig-devel
@@ -168,8 +169,9 @@ BuildArch: noarch
 %setup -q
 
 %patch519 -p1
+%patch520 -p1
+%patch521 -p1
 %patch50 -p1 -b .PackageKit
-%patch51 -p1
 
 %if 0%{?fedora} > 22
 %patch100 -p1
@@ -317,6 +319,9 @@ fi
 
 
 %changelog
+* Mon Mar 28 2016 Rex Dieter <rdieter@fedoraproject.org> 5.5.5-5
+- upstream fixes for: No 'favorites' in F24 KDE menu (#1320395,kde#357029)
+
 * Fri Mar 25 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.5.5-4
 - favorites: cleanup, no backups, f22+ fix firefox/konsole/discover, f22 fix konq/konsole/discover