diff --git a/akonadi-contact.spec b/akonadi-contact.spec
index 94bba53..1816215 100644
--- a/akonadi-contact.spec
+++ b/akonadi-contact.spec
@@ -32,6 +32,7 @@ Url:            http://www.kde.org
 Source:         akonadi-contacts-%{version}.tar.xz
 BuildRequires:  akonadi-mime-devel
 BuildRequires:  akonadi-server-devel >= %{_kapp_version}
+BuildRequires:  cmake(KF5Prison)
 BuildRequires:  extra-cmake-modules >= %{kf5_version}
 BuildRequires:  grantlee5-devel
 BuildRequires:  kcalcore-devel
@@ -42,7 +43,6 @@ BuildRequires:  kf5-filesystem
 BuildRequires:  kio-devel >= %{kf5_version}
 BuildRequires:  kmime-devel
 BuildRequires:  pkgconfig
-BuildRequires:  cmake(KF5Prison)
 BuildRequires:  pkgconfig(Qt5Test) >= 5.6.0
 BuildRequires:  pkgconfig(Qt5WebEngine) >= 5.6.0
 BuildRequires:  pkgconfig(Qt5WebEngineWidgets) >= 5.6.0
@@ -70,6 +70,15 @@ Obsoletes:      akonadi-socialutils-devel
 This package provides a library used for handling personal contacts,
 as part of the KDE Personal Information Management (PIM) software.
 
+%package -n libKF5ContactEditor5
+Summary:        Library for personal contact handling
+Group:          System/Libraries
+Requires:       akonadi-contact >= %{version}
+
+%description -n libKF5ContactEditor5
+This package provides a library used for handling personal contacts,
+as part of the KDE Personal Information Management (PIM) software.
+
 %package devel
 Summary:        KDE PIM Libraries: Build Environment
 Group:          Development/Libraries/KDE
@@ -102,36 +111,50 @@ to develop KDE PIM applications.
 
 %post -n libKF5AkonadiContact5 -p /sbin/ldconfig
 %postun -n libKF5AkonadiContact5 -p /sbin/ldconfig
+%post -n libKF5ContactEditor5 -p /sbin/ldconfig
+%postun -n libKF5ContactEditor5 -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
 %doc COPYING*
 %dir %{_kf5_plugindir}
-%{_kf5_plugindir}/kcm_akonadicontact_actions.so
-%{_kf5_servicesdir}/akonadicontact_actions.desktop
-%{_kf5_servicetypesdir}/kaddressbookimprotocol.desktop
-%{_kf5_datadir}/akonadi/contact/
 %dir %{_kf5_servicesdir}/akonadi
 %dir %{_kf5_servicesdir}/akonadi/contact
+%config %{_kf5_configdir}/akonadi-contacts.categories
+%config %{_kf5_configdir}/contact-editor.categories
+%{_kf5_datadir}/akonadi/contact/
+%{_kf5_datadir}/contacteditor/
+%{_kf5_plugindir}/kcm_akonadicontact_actions.so
 %{_kf5_servicesdir}/akonadi/contact/
-%{_datadir}/akonadicontact/
+%{_kf5_servicesdir}/akonadicontact_actions.desktop
+%{_kf5_servicetypesdir}/kaddressbookimprotocol.desktop
 
 %files -n libKF5AkonadiContact5
 %defattr(-,root,root)
 %doc COPYING*
 %{_kf5_libdir}/libKF5AkonadiContact.so.*
 
+%files -n libKF5ContactEditor5
+%defattr(-,root,root)
+%doc COPYING*
+%{_kf5_libdir}/libKF5ContactEditor.so.*
+
+
 %files devel
 %defattr(-,root,root)
 %doc COPYING*
-%{_kf5_libdir}/cmake/KF5AkonadiContact/
-%{_kf5_libdir}/libKF5AkonadiContact.so
 %dir %{_kf5_includedir}/Akonadi
 %dir %{_kf5_includedir}/akonadi
 %{_kf5_includedir}/Akonadi/Contact/
-%{_kf5_includedir}/akonadi/contact/
+%{_kf5_includedir}/Akonadi/ContactEditor/
 %{_kf5_includedir}/akonadi-contact_version.h
+%{_kf5_includedir}/akonadi/contact/
+%{_kf5_libdir}/cmake/KF5AkonadiContact/
+%{_kf5_libdir}/cmake/KF5AkonadiContactEditor/
+%{_kf5_libdir}/libKF5AkonadiContact.so
+%{_kf5_libdir}/libKF5ContactEditor.so
 %{_kf5_mkspecsdir}/qt_AkonadiContact.pri
+%{_kf5_mkspecsdir}/qt_ContactEditor.pri
 
 %if %{with lang}
 %files lang -f %{name}.lang
@@ -139,3 +162,5 @@ to develop KDE PIM applications.
 %endif
 
 %changelog
+
+