diff --git a/baselibs.conf b/baselibs.conf
index 0499d7b..27359ba 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,5 +1,7 @@
-libKF5WaylandClient5
-libKF5WaylandServer5
+kwayland
+	provides "libKF5WaylandClient5-<targettype> = <version>"
+	obsoletes "libKF5WaylandServer5-<targettype> <= <version>"
+	provides "libKF5WaylandServer5-<targettype> = <version>"
+	obsoletes "libKF5WaylandServer5-<targettype> <= <version>"
 kwayland-devel
-	requires "libKF5WaylandClient5-<targettype> = <version>"
-	requires "libKF5WaylandServer5-<targettype> = <version>"
\ No newline at end of file
+	requires "kwayland-<targettype> = <version>"
\ No newline at end of file
diff --git a/kwayland-5.3.2.tar.xz b/kwayland-5.3.2.tar.xz
deleted file mode 100644
index f157bc5..0000000
--- a/kwayland-5.3.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:916d1be1ba46ecff321b0dcb3031032955bef1fb538928955ab6ba95e11e13fd
-size 92452
diff --git a/kwayland-5.3.95.tar.xz b/kwayland-5.3.95.tar.xz
new file mode 100644
index 0000000..6f3a33a
--- /dev/null
+++ b/kwayland-5.3.95.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:efd787061e7897d28ccdd92a932c583844ee1e0fbcf895882e040b295ba32992
+size 111668
diff --git a/kwayland.spec b/kwayland.spec
index 5542fc0..98e6980 100644
--- a/kwayland.spec
+++ b/kwayland.spec
@@ -16,9 +16,8 @@
 #
 
 
-%define kwayland_server 1
 Name:           kwayland
-Version:        5.3.2
+Version:        5.3.95
 Release:        0
 Summary:        KDE Wayland library
 License:        LGPL-2.1+
@@ -30,38 +29,27 @@ BuildRequires:  cmake >= 2.8.12
 BuildRequires:  extra-cmake-modules >= 1.4.0
 BuildRequires:  fdupes
 BuildRequires:  kf5-filesystem
+BuildRequires:  libQt5Gui-private-headers-devel >= 5.4.0
 BuildRequires:  wayland-devel >= 1.3.0
 BuildRequires:  pkgconfig(Qt5Gui) >= 5.4.0
 BuildRequires:  pkgconfig(Qt5Test) >= 5.4.0
 BuildRequires:  pkgconfig(egl)
+Provides:       libKF5WaylandClient5 = %{version}
+Obsoletes:      libKF5WaylandClient5 <= %{version}
+Provides:       libKF5WaylandServer5 = %{version}
+Obsoletes:      libKF5WaylandServer5 <= %{version}
+%requires_eq libQt5Gui5
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 KWayland provides a Qt-style Client and Server library wrapper for the Wayland libraries.
 
-%package -n libKF5WaylandClient5
-Summary:        KDE Wayland library
-Group:          Development/Libraries/KDE
-
-%description -n libKF5WaylandClient5
-KWayland provides a Qt-style Client and Server library wrapper for the Wayland libraries.
-
-%package -n libKF5WaylandServer5
-Summary:        KDE Wayland library
-Group:          Development/Libraries/KDE
-
-%description -n libKF5WaylandServer5
-KWayland provides a Qt-style Client and Server library wrapper for the Wayland libraries.
-
 %package devel
 Summary:        KDE Wayland library: Build Environment
 Group:          Development/Libraries/KDE
+Requires:       %{name} = %{version}
 Requires:       extra-cmake-modules >= 1.2.0
-Requires:       libKF5WaylandClient5 = %{version}
 Requires:       pkgconfig(Qt5Gui) >= 5.4.0
-%if %kwayland_server
-Requires:       libKF5WaylandServer5 = %{version}
-%endif
 
 %description devel
 KWayland provides a Qt-style Client and Server library wrapper for the Wayland libraries.
@@ -76,35 +64,24 @@ KWayland provides a Qt-style Client and Server library wrapper for the Wayland l
 %install
   %kf5_makeinstall -C build
 
-%post -n libKF5WaylandClient5 -p /sbin/ldconfig
+%post   -p /sbin/ldconfig
 
-%postun -n libKF5WaylandClient5 -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
-%if %kwayland_server
-%post -n libKF5WaylandServer5 -p /sbin/ldconfig
-
-%postun -n libKF5WaylandServer5 -p /sbin/ldconfig
-%endif
-
-%files -n libKF5WaylandClient5
+%files
 %defattr(-,root,root)
 %doc COPYING*
+%config %{_kf5_configdir}/org_kde_kwayland.categories
 %{_kf5_libdir}/libKF5WaylandClient.so.*
-
-%if %kwayland_server
-%files -n libKF5WaylandServer5
-%defattr(-,root,root)
-%doc COPYING*
 %{_kf5_libdir}/libKF5WaylandServer.so.*
-%endif
 
 %files devel
 %defattr(-,root,root)
 %{_kf5_libdir}/libKF5WaylandClient.so
-%if %kwayland_server
 %{_kf5_libdir}/libKF5WaylandServer.so
-%endif
 %{_kf5_libdir}/cmake/KF5Wayland/
 %{_kf5_includedir}/
+%{_kf5_mkspecsdir}/qt_KWaylandClient.pri
+%{_kf5_mkspecsdir}/qt_KWaylandServer.pri
 
 %changelog