diff --git a/python-keyring.changes b/python-keyring.changes
index d48b913..f75569d 100644
--- a/python-keyring.changes
+++ b/python-keyring.changes
@@ -1,7 +1,8 @@
 -------------------------------------------------------------------
-Fri Mar 22 13:59:27 UTC 2013 - speilicke@suse.com
+Fri Mar 22 14:07:23 UTC 2013 - speilicke@suse.com
 
-- Bring back kde and gnome sub-packages, this time with proper requires
+- Require python-gnomekeyring to have a working keyring on both
+  Gnome and KDE.
 
 -------------------------------------------------------------------
 Mon Feb 11 09:19:27 UTC 2013 - saschpe@suse.de
diff --git a/python-keyring.spec b/python-keyring.spec
index 4767fb3..0835889 100644
--- a/python-keyring.spec
+++ b/python-keyring.spec
@@ -32,6 +32,15 @@ BuildRequires:  python-mock
 BuildRequires:  python-nose
 BuildRequires:  python-pytest-runner
 BuildRequires:  python-unittest2
+Provides:       python-keyring-kde = %{version}
+Obsoletes:      python-keyring-kde < %{version}
+Provides:       python-keyring-gnome = %{version}
+Obsoletes:      python-keyring-gnome < %{version}
+#NOTE(saschpe): When running under KDE, the 'Gnome' keyring backend is chosen still.
+# on openSUSE, python-gnomekeyring has much less deps than python-kde4, so we take
+# it as the default:
+Requires:       python-gnomekeyring
+Recommends:     python-kde4
 %if 0%{?suse_version} && 0%{?suse_version} <= 1110
 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %else
@@ -42,30 +51,6 @@ BuildArch:      noarch
 The Python keyring lib provides a easy way to access the system keyring service
 from python. It can be used in any application that needs safe password storage.
 
-%package gnome
-Summary:        Store and access your passwords safely - Gnome backend
-Group:          Development/Languages/Python
-Requires:       %{name} = %{version}
-Requires:       python-gnomekeyring
-
-%description gnome
-The Python keyring lib provides a easy way to access the system keyring service
-from python. It can be used in any application that needs safe password storage.
-
-This package contains the Gnome (kwallet) backend.
-
-%package kde
-Summary:        Store and access your passwords safely - KDE backend
-Group:          Development/Languages/Python
-Requires:       %{name} = %{version}
-Requires:       python-kde4
-
-%description kde
-The Python keyring lib provides a easy way to access the system keyring service
-from python. It can be used in any application that needs safe password storage.
-
-This package contains the KDE (kwallet) backend.
-
 %prep
 %setup -q -n keyring-%{version}
 # For rpmlint warning: remove shebang from python library:
@@ -76,7 +61,6 @@ python setup.py build
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
-rm -r %{buildroot}%{python_sitelib}/keyring/tests # Don't ship testsuite
 
 %check
 nosetests
@@ -86,15 +70,5 @@ nosetests
 %doc CONTRIBUTORS.txt README.rst CHANGES.rst
 %{_bindir}/keyring
 %{python_sitelib}/*
-%exclude %{python_sitelib}/keyring/backends/Gnome.py*
-%exclude %{python_sitelib}/keyring/backends/kwallet.py*
-
-%files gnome
-%defattr(-,root,root)
-%{python_sitelib}/keyring/backends/Gnome.py*
-
-%files kde
-%defattr(-,root,root)
-%{python_sitelib}/keyring/backends/kwallet.py*
 
 %changelog