diff --git a/PackageKit.spec b/PackageKit.spec
index cd962ed..4255232 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -8,7 +8,7 @@
 Summary:   System daemon that is a DBUS abstraction layer for package management
 Name:      PackageKit
 Version:   0.3.5
-Release:   3%{?dist}
+Release:   4%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://packagekit.freedesktop.org
@@ -24,8 +24,8 @@ Patch1:    pk-fix-cancel-at-speed-unlucky.patch
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-libs = %{version}-%{release}
-Requires: yum-packagekit = %{version}-%{release}
-Requires: udev-packagekit = %{version}-%{release}
+Requires: PackageKit-udev-helper = %{version}-%{release}
+Requires: PackageKit-yum-plugin = %{version}-%{release}
 Requires: PackageKit-yum = %{version}-%{release}
 Requires: shared-mime-info
 Requires: python-sqlite2
@@ -82,25 +82,27 @@ Requires: %{name} = %{version}-%{release}
 %description docs
 API docs for PackageKit.
 
-%package -n udev-packagekit
+%package udev-helper
 Summary: Tell PackageKit to install firmware that udev requires
 Group: System Environment/Base
 Requires: udev
 Requires: PackageKit
+Obsoletes: udev-packagekit
 
-%description -n udev-packagekit
-udev-packagekit tells PackageKit that firmware was not available and was
+%description udev-helper
+PackageKit-udev-helper tells PackageKit that firmware was not available and was
 needed. This allows PackageKit to do the right thing and prompt for
 the firmware to be installed.
 
-%package -n yum-packagekit
+%package yum-plugin
 Summary: Tell PackageKit to check for updates when yum exits
 Group: System Environment/Base
 Requires: yum >= 3.0
 Requires: PackageKit
+Obsoletes: yum-packagekit
 
-%description -n yum-packagekit
-yum-packagekit tells PackageKit to check for updates when yum exits.
+%description yum-plugin
+PackageKit-yum-plugin tells PackageKit to check for updates when yum exits.
 This way, if you run 'yum update' and install all available updates, puplet
 will almost instantly update itself to reflect this.
 
@@ -255,13 +257,13 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %dir %{_datadir}/PackageKit/helpers/yum
 %{_datadir}/PackageKit/helpers/yum/*
 
-%files -n yum-packagekit
+%files yum-plugin
 %defattr(-, root, root)
 %doc README AUTHORS NEWS COPYING
 %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/refresh-packagekit.conf
 /usr/lib/yum-plugins/refresh-packagekit.*
 
-%files -n udev-packagekit
+%files udev-helper
 %defattr(-, root, root)
 %doc README AUTHORS NEWS COPYING
 %{_sysconfdir}/udev/rules.d/*.rules
@@ -300,6 +302,11 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_includedir}/*
 
 %changelog
+* Wed Oct 01 2008 Richard Hughes  <rhughes@redhat.com> - 0.3.5-4
+- Rename the subpackages before David blows a blood vessel.
+- yum-packagekit  -> PackageKit-yum-plugin
+- udev-packagekit -> PackageKit-udev-helper
+
 * Tue Sep 30 2008 Richard Hughes  <rhughes@redhat.com> - 0.3.5-3
 - Fix a bug where the daemon could crash when cancelling a lot of transactions.
 - Fix installing codecs with a 64 bit machine