diff --git a/kf5-kwallet.spec b/kf5-kwallet.spec
index 79fc952..1583745 100644
--- a/kf5-kwallet.spec
+++ b/kf5-kwallet.spec
@@ -2,7 +2,7 @@
 
 Name:           kf5-%{framework}
 Version:        5.8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        KDE Frameworks 5 Tier 3 solution for password management
 
 License:        LGPLv2+
@@ -32,8 +32,11 @@ BuildRequires:  kf5-knotifications-devel
 BuildRequires:  kf5-kservice-devel
 BuildRequires:  kf5-kwidgetsaddons-devel
 
+Obsoletes:      kf5-kwallet-runtime < 5.8.0-2
+Provides:       kf5-kwallet-runtime = %{version}-%{release}
+Provides:       kf5-kwallet-runtime%{?_isa} = %{version}-%{release}
+
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
-Requires:       %{name}-runtime%{?_isa} = %{version}-%{release}
 
 %description
 KWallet is a secure and unified container for user passwords.
@@ -41,18 +44,10 @@ KWallet is a secure and unified container for user passwords.
 %package        libs
 Summary:        KWallet framework libraries
 Requires:       kf5-filesystem
+Requires:       %{name} = %{version}-%{release}
 %description    libs
 Provides API to access KWallet data from applications.
 
-%package        runtime
-Summary:        KWallet runtime deamon
-
-%description    runtime
-Provides a runtime deamon that stores passwords.
-
-# FIXME: -devel can only depend on -api, otherwise we get circular  dependency
-# problem, because -runtime depends on kf5-kded, which is not compiled at this point
-# (kf5-kio requires kf5-kwallet, but kf5-kded requires kf5-kinit, which requires kf5-kio)
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
@@ -68,21 +63,28 @@ developing applications that use %{name}.
 %prep
 %setup -q -n %{framework}-%{version}
 
+
 %build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
+
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%find_lang kwalletd5_qt --with-qt --all-name
+%find_lang %{name} --with-qt --all-name
 
 
-%files
+%files -f %{name}.lang
 %doc COPYING.LIB README.md
+%{_kf5_datadir}/dbus-1/services/org.kde.kwalletd5.service
+%{_kf5_datadir}/dbus-1/services/org.kde.kwalletd.service
+%{_kf5_bindir}/kwalletd5
+%{_kf5_datadir}/kservices5/kwalletd5.desktop
+%{_kf5_datadir}/knotifications5/kwalletd.notifyrc
 
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
@@ -91,13 +93,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %{_kf5_libdir}/libKF5Wallet.so.*
 %{_kf5_libdir}/libkwalletbackend5.so.*
 
-%files runtime -f kwalletd5_qt.lang
-%{_kf5_datadir}/dbus-1/services/org.kde.kwalletd5.service
-%{_kf5_datadir}/dbus-1/services/org.kde.kwalletd.service
-%{_kf5_bindir}/kwalletd5
-%{_kf5_datadir}/kservices5/kwalletd5.desktop
-%{_kf5_datadir}/knotifications5/kwalletd.notifyrc
-
 %files devel
 %{_kf5_datadir}/dbus-1/interfaces/kf5_org.kde.KWallet.xml
 %{_kf5_includedir}/kwallet_version.h
@@ -109,6 +104,11 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Wed Mar 25 2015 Rex Dieter <rdieter@fedoraproject.org> 
+- 5.8.0-2
+- -libs: Requires: kf5-kwallet
+- drop -runtime (include in main pkg now)
+
 * Mon Mar 16 2015 Daniel Vrátil <dvratil@redhat.com> - 5.8.0-1
 - KDE Frameworks 5.8.0