diff --git a/akonadi-server.spec b/akonadi-server.spec
index ab7a455..f7a1e6d 100644
--- a/akonadi-server.spec
+++ b/akonadi-server.spec
@@ -28,14 +28,29 @@ Source:         %{rname}-%{version}.tar.xz
 Source99:       akonadi-server-rpmlintrc
 BuildRequires:  boost-devel
 BuildRequires:  cmake >= 2.8.9
-BuildRequires:  extra-cmake-modules
 BuildRequires:  kf5-filesystem
 BuildRequires:  libxml2
 BuildRequires:  libxslt
 BuildRequires:  mariadb
-BuildRequires:  postgresql-devel
 BuildRequires:  shared-mime-info
 BuildRequires:  sqlite3-devel
+BuildRequires:  postgresql-devel
+BuildRequires:  extra-cmake-modules
+BuildRequires:  cmake(KF5ItemViews)
+BuildRequires:  cmake(KF5KIO)
+BuildRequires:  cmake(KF5Config)
+BuildRequires:  cmake(KF5I18n)
+BuildRequires:  cmake(KF5DesignerPlugin)
+BuildRequires:  cmake(KF5DBusAddons)
+BuildRequires:  cmake(KF5ItemModels)
+BuildRequires:  cmake(KF5GuiAddons)
+BuildRequires:  cmake(KF5IconThemes)
+BuildRequires:  cmake(KF5WindowSystem)
+BuildRequires:  cmake(KF5Completion)
+BuildRequires:  cmake(Qt5Designer)
+BuildRequires:  boost-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  libxslt-tools
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(Qt5Gui)
@@ -56,36 +71,32 @@ Obsoletes:      akonadi-runtime < %{version}
 %else
 Conflicts:      akonadi-runtime
 %endif
+Obsoletes:      akonadi5 < %{version}
+Provides:       akonadi5 = %{version}
+Obsoletes:      libKF5AkonadiPrivate5 < %{version}
+Provides:       libKF5AkonadiPrivate5 = %{version}
 
 %description
 This package contains the data files of Akonadi, the KDE PIM storage
 service.
 
-%package -n libKF5AkonadiPrivate-devel
-Summary:        PIM Storage Service: Build Environment
-Group:          Development/Libraries/X11
-Requires:       %{name} = %{version}
-Requires:       libKF5AkonadiPrivate5 = %{version}
-%if 0%{?suse_version} > 1320
-Obsoletes:      libakonadiprotocolinternals-devel < %{version}
-%else
-Conflicts:      libakonadiprotocolinternals-devel
-%endif
-
-%description -n libKF5AkonadiPrivate-devel
-This package contains development files of Akonadi, the KDE PIM storage
-service.
-
-%package -n libKF5AkonadiPrivate5
-Summary:        PIM Storage Service
-Group:          System/GUI/KDE
-
-%description -n libKF5AkonadiPrivate5
+%description
 This package contains the data files of Akonadi, the KDE PIM storage
 service.
 
+%package devel
+Summary:        Akonadi Framework: Build Environment
+Group:          Development/Libraries/X11
+Requires:       %{name} = %{version}
+Obsoletes:      libKF5AkonadiPrivate-devel < %{version}
+Provides:       libKF5AkonadiPrivate-devel = %{version}
+
+%description devel
+This package contains development files of Akonadi, the KDE PIM storage
+service.
+
 %prep
-%setup -q -n %{rname}-%{version}
+%setup -q -n %{name}-%{version}
 
 %build
   %cmake_kf5 -d build -- -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DQT_PLUGINS_DIR=%{_kf5_plugindir}
@@ -102,35 +113,49 @@ service.
 /sbin/ldconfig
 %{_kf5_bindir}/update-mime-database %{_kf5_sharedir}/mime &> /dev/null || :
 
-%post -n libKF5AkonadiPrivate5 -p /sbin/ldconfig
-
-%postun -n libKF5AkonadiPrivate5 -p /sbin/ldconfig
-
 %files
 %defattr(-,root,root)
-%doc lgpl-license AUTHORS README*
-%dir %{_kf5_sysconfdir}/xdg/akonadi
-%config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global-mobile.conf
-%config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global.conf
-%{_kf5_bindir}/akonadi*
 %{_kf5_bindir}/asapcat
-%{_kf5_plugindir}/sqldrivers/libqsqlite3.so
-%{_kf5_sharedir}/dbus-1/services/org.freedesktop.Akonadi.Control.service
-%{_kf5_sharedir}/mime/packages/akonadi-mime.xml
+%{_kf5_bindir}/akonadi*
+%dir %{_kf5_sysconfdir}/xdg/akonadi
 %{_kf5_sysconfdir}/xdg/akonadi.categories
-
-%files -n libKF5AkonadiPrivate-devel
-%defattr(-,root,root)
-%doc lgpl-license
-%dir %{_kf5_libdir}/cmake
-%{_kf5_includedir}/akonadi/
-%{_kf5_libdir}/cmake/KF5AkonadiServer/
-%{_kf5_libdir}/libKF5AkonadiPrivate.so
+%config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global.conf
+%config %{_kf5_sysconfdir}/xdg/akonadi/mysql-global-mobile.conf
+%{_kf5_sharedir}/dbus-1/services/org.freedesktop.Akonadi.Control.service
 %{_kf5_sharedir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml
+%{_kf5_sharedir}/mime/packages/akonadi-mime.xml
+%{_kf5_plugindir}/sqldrivers/libqsqlite3.so
+%{_datadir}/kf5/akonadi/
+%dir %{_kf5_configkcfgdir}
+%{_kf5_configkcfgdir}/resourcebase.kcfg
+%{_kf5_plugindir}/designer/
+%{_libdir}/libKF5AkonadiPrivate.so.*
+%{_libdir}/libKF5AkonadiCore.so.*
+%{_libdir}/libKF5AkonadiAgentBase.so.*
+%{_libdir}/libKF5AkonadiWidgets.so.*
+%{_libdir}/libKF5AkonadiXml.so.*
+%{_kf5_plugindir}/akonadi/
+%{_datadir}/akonadi/
+%{_datadir}/kf5/akonadi_knut_resource/
 
-%files -n libKF5AkonadiPrivate5
+%files devel
 %defattr(-,root,root)
-%doc lgpl-license
-%{_kf5_libdir}/libKF5AkonadiPrivate.so.*
+%{_kf5_includedir}/akonadi/
+%{_kf5_includedir}/AkonadiCore/
+%{_kf5_includedir}/AkonadiAgentBase/
+%{_kf5_includedir}/AkonadiWidgets/
+%{_kf5_includedir}/AkonadiXml/
+%dir %{_kf5_libdir}/cmake
+%{_kf5_libdir}/cmake/KF5Akonadi
+%{_kf5_includedir}/akonadi_version.h
+%{_libdir}/libKF5AkonadiPrivate.so
+%{_libdir}/libKF5AkonadiCore.so
+%{_libdir}/qt5/mkspecs/modules/qt_AkonadiCore.pri
+%{_libdir}/libKF5AkonadiAgentBase.so
+%{_libdir}/qt5/mkspecs/modules/qt_AkonadiAgentBase.pri
+%{_libdir}/libKF5AkonadiWidgets.so
+%{_libdir}/qt5/mkspecs/modules/qt_AkonadiWidgets.pri
+%{_libdir}/libKF5AkonadiXml.so
+%{_libdir}/qt5/mkspecs/modules/qt_AkonadiXml.pri
 
 %changelog