diff --git a/discover-5.5.4.tar.xz b/discover-5.5.4.tar.xz
deleted file mode 100644
index 8417944..0000000
--- a/discover-5.5.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3bac1dfbc60ec57649954ce14c792143d0f2f3314cc6b8a502e4abe2d242ba34
-size 843084
diff --git a/discover-5.5.95.tar.xz b/discover-5.5.95.tar.xz
new file mode 100644
index 0000000..dc2490a
--- /dev/null
+++ b/discover-5.5.95.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5d714dd25c94a879d8b2b1a0b5b2eea7fed49e58d15cba20710257610ccc25bc
+size 837676
diff --git a/discover.spec b/discover.spec
index aa20942..b1973e1 100644
--- a/discover.spec
+++ b/discover.spec
@@ -17,50 +17,40 @@
 
 
 Name:           discover
-Version:        5.5.4
+Version:        5.5.95
 Release:        0
 Summary:        KDE Software Installer
 License:        GPL-2.0
 Group:          System/GUI/KDE
 Url:            https://quickgit.kde.org/?p=discover.git
 Source0:        %{name}-%{version}.tar.xz
-#PATCH-FIX-UPSTREAM fix_for_gcc4.diff  -- adjust the connect call so that it also builds with gcc48
-Patch1:         fix_for_gcc4.diff
 BuildRequires:  PackageKit-Qt5-devel
-BuildRequires:  libAppstreamQt-devel
 BuildRequires:  cmake >= 2.8.12
-BuildRequires:  karchive-devel
-BuildRequires:  kconfig-devel
-BuildRequires:  kconfigwidgets-devel
-BuildRequires:  kcoreaddons-devel
-BuildRequires:  kdbusaddons-devel
-BuildRequires:  kdeclarative-devel
+BuildRequires:  extra-cmake-modules
 BuildRequires:  kf5-filesystem
-BuildRequires:  ki18n-devel
-BuildRequires:  kiconthemes-devel
-BuildRequires:  kio-devel
-BuildRequires:  kitemviews-devel
-BuildRequires:  knewstuff-devel
-BuildRequires:  knotifications-devel
-BuildRequires:  ktextwidgets-devel
-BuildRequires:  kwallet-devel
-BuildRequires:  kwidgetsaddons-devel
-BuildRequires:  libattica-devel
-BuildRequires:  plasma-framework-devel
-BuildRequires:  solid-devel
+BuildRequires:  libAppstreamQt-devel
 BuildRequires:  update-desktop-files
-BuildRequires:  pkgconfig(Qt5Concurrent)
-BuildRequires:  pkgconfig(Qt5Core) >= 5.2.0
-BuildRequires:  pkgconfig(Qt5DBus)
-BuildRequires:  pkgconfig(Qt5Network)
-BuildRequires:  pkgconfig(Qt5Qml)
-BuildRequires:  pkgconfig(Qt5QuickWidgets)
-BuildRequires:  pkgconfig(Qt5Svg)
-BuildRequires:  pkgconfig(Qt5Test)
-BuildRequires:  pkgconfig(Qt5Widgets)
-BuildRequires:  pkgconfig(Qt5Xml)
-Requires:       libzypp-plugin-appdata
+BuildRequires:  cmake(KF5Attica)
+BuildRequires:  cmake(KF5Config)
+BuildRequires:  cmake(KF5CoreAddons)
+BuildRequires:  cmake(KF5DBusAddons)
+BuildRequires:  cmake(KF5Declarative)
+BuildRequires:  cmake(KF5I18n)
+BuildRequires:  cmake(KF5NewStuff)
+BuildRequires:  cmake(KF5Plasma)
+BuildRequires:  cmake(KF5TextWidgets)
+BuildRequires:  cmake(KIO)
+BuildRequires:  cmake(Notifications)
+BuildRequires:  cmake(Qca-qt5)
+BuildRequires:  cmake(Qt5Concurrent)
+BuildRequires:  cmake(Qt5DBus)
+BuildRequires:  cmake(Qt5Network)
+BuildRequires:  cmake(Qt5Quick)
+BuildRequires:  cmake(Qt5Test)
+BuildRequires:  cmake(Qt5Widgets)
+BuildRequires:  cmake(Qt5Xml)
 Requires:       AppStream
+Requires:       libzypp-plugin-appdata
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -68,6 +58,7 @@ Disover is the KDE software installer, implemented as an app store like applicat
 
 %package plasmoid
 Summary:        Update notification plasmoid for KDE Software Manager
+Group:          System/GUI/KDE
 Conflicts:      plasma5-pk-updates
 Requires:       %{name} = %{version}
 
@@ -78,7 +69,6 @@ This is the systray plasmoid to notify the user that updates are available
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
   %cmake_kf5 -d build
@@ -88,7 +78,7 @@ This is the systray plasmoid to notify the user that updates are available
   %kf5_makeinstall -C build
   %suse_update_desktop_file -r org.kde.discover Qt KDE System PackageManager
   %suse_update_desktop_file -r muon-updater Qt KDE System PackageManager
- 
+
   %find_lang muon-notifier %{name}.lang
   %find_lang muon-updater %{name}.lang
   %find_lang muon-exporter %{name}.lang
@@ -130,5 +120,4 @@ This is the systray plasmoid to notify the user that updates are available
 %{_datadir}/plasma/plasmoids/org.kde.discovernotifier/
 %{_kf5_servicesdir}/plasma-applet-org.kde.discovernotifier.desktop
 
-
 %changelog
diff --git a/fix_for_gcc4.diff b/fix_for_gcc4.diff
deleted file mode 100644
index 798f641..0000000
--- a/fix_for_gcc4.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-From e651466574bc08a8afe5b8bff40d23070f94d434 Mon Sep 17 00:00:00 2001
-From: Raymond Wooninck <tittiatcoke@gmail.com>
-Date: Fri, 5 Feb 2016 10:40:05 +0100
-Subject: Make it compile with GCC < 5
-
-
-diff --git a/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp b/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
-index 48a75e2..af095eb 100644
---- a/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
-+++ b/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
-@@ -196,7 +196,7 @@ void PackageKitBackend::refreshDatabase()
- {
-     if (!m_refresher) {
-         m_refresher = PackageKit::Daemon::refreshCache(false);
--        connect(m_refresher, &PackageKit::Transaction::finished, this, &PackageKitBackend::reloadPackageList);
-+        connect(m_refresher.data(), &PackageKit::Transaction::finished, this, &PackageKitBackend::reloadPackageList);
-     } else {
-         qWarning() << "already resetting";
-     }