diff --git a/libguestfs.spec b/libguestfs.spec
index f36cc69..beab7f4 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -74,7 +74,8 @@ BuildRequires:  pkgconfig(rpm) >= 4.6.0
 BuildRequires:  pkgconfig(tinfo)
 
 Requires:       supermin >= 5.1.18
-Obsoletes:      libguestfs0
+Provides:       libguestfs0 = %{version}
+Obsoletes:      libguestfs0 < %{version}
 
 %description
 libguestfs is a set of tools for accessing and modifying virtual machine (VM)
@@ -289,17 +290,19 @@ rm -rf %{buildroot}/tmp
 %config %{_sysconfdir}/profile.d/guestfish.sh
 %config(noreplace) %{_sysconfdir}/libguestfs-tools.conf
 
-%package -n guestfsd
+%package -n libguestfsd
 Summary:        Daemon for the libguestfs appliance
 Conflicts:      libaugeas0 < 1.0.0
+Provides:       guestfsd = %{version}
+Obsoletes:      guestfsd < %{version}
 
-%description -n guestfsd
+%description -n libguestfsd
 guestfsd runs within the libguestfs appliance. It receives commands from the host
 and performs the requested action by calling the helper binaries.
 This package is only required for building the appliance.
 
 
-%package -n guestfs-data
+%package -n libguestfs-appliance
 BuildRequires:  augeas-lenses
 BuildRequires:  bc
 BuildRequires:  btrfsprogs
@@ -382,22 +385,24 @@ Recommends:     xfsprogs
 Recommends:     zerofree
 
 Summary:        Virtual machine needed for libguestfs
-Provides:       libguestfs-data = %{version}
-Obsoletes:      libguestfs-data < %{version}
+Provides:       guestfs-data = %{version}
+Obsoletes:      guestfs-data < %{version}
 
-%description -n guestfs-data
+%description -n libguestfs-appliance
 libguestfs needs for it's run a virtual machine image.
 This package provides such an image, an initrd and a kernel.
 
 
-%package -n guestfs-winsupport
+%package winsupport
 Summary:        Windows guest support in libguestfs
 Requires:       libguestfs >= 1.32
 BuildRequires:  ntfs-3g
 BuildRequires:  ntfsprogs
 BuildRequires:  rsync
+Provides:       guestfs-winsupport = %{version}
+Obsoletes:      guestfs-winsupport < %{version}
 
-%description -n guestfs-winsupport
+%description winsupport
 Provides the needed pieces for libguestfs to handle Windows guests.
 
 
@@ -574,7 +579,7 @@ Requires:       %{name} = %{version}-%{release}
 %{name}-man-pages-uk contains Ukrainian (uk) man pages
 for %{name}.
 
-%files -n guestfs-data
+%files -n libguestfs-appliance
 %dir %{_libdir}/guestfs
 %dir %{_libdir}/guestfs/supermin.d
 %{_libdir}/guestfs/supermin.d/base.tar.gz
@@ -586,7 +591,7 @@ for %{name}.
 %{_libdir}/guestfs/supermin.d/packages
 %{_libdir}/guestfs/supermin.d/zz-scripts.tar.gz
 
-%files -n guestfs-winsupport
+%files winsupport
 %{_libdir}/guestfs/supermin.d/zz-*winsupport*
 
 %files bash-completion
@@ -673,7 +678,7 @@ for %{name}.
 %{_mandir}/man3/guestfs-examples.3*
 %{_mandir}/man3/libguestfs.3*
 
-%files -n guestfsd
+%files -n libguestfsd
 %{_udevrulesdir}
 %{_sbindir}/guestfsd
 %{_mandir}/man8/*