diff --git a/rpm-ostree.spec b/rpm-ostree.spec
index bb49a1d..b5a3b1e 100644
--- a/rpm-ostree.spec
+++ b/rpm-ostree.spec
@@ -1,7 +1,7 @@
 Summary: Hybrid image/package system
 Name: rpm-ostree
 Version: 2017.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 #VCS: https://github.com/cgwalters/rpm-ostree
 # This tarball is generated via "make -f Makefile.dist-packaging dist-snapshot"
 Source0: rpm-ostree-%{version}.tar.xz
@@ -68,22 +68,20 @@ Additionally, unlike many "pure" image systems, with rpm-ostree
 each client system can layer on additional packages, providing
 a "best of both worlds" approach.
 
-%package -n librpmostree
+%package libs
 Summary: Shared library for rpm-ostree
 Group: Development/Libraries
 
-%description -n librpmostree
-The librpmostree package includes the shared library for %{name}.
+%description libs
+The %{name}-libs package includes the shared library for %{name}.
 
-# Renamed to librpmostree in 2017.7-2
-%package -n librpmostree-devel
+%package devel
 Summary: Development headers for %{name}
 Group: Development/Libraries
-Requires: librpmostree = %{version}-%{release}
-Obsoletes: %{name}-devel < 2017.7-2
+Requires: %{name}-libs = %{version}-%{release}
 
-%description -n librpmostree-devel
-The librpmostree-devel package includes the header files for librpmostree.
+%description devel
+The %{name}-devel package includes the header files for %{name}-libs.
 
 %prep
 %autosetup -Sgit -n %{name}-%{version}
@@ -145,17 +143,21 @@ python autofiles.py > files.devel \
 %files -f files
 %doc COPYING README.md
 
-%files -n librpmostree -f files.lib
+%files libs -f files.lib
 
-%files -n librpmostree-devel -f files.devel
+%files devel -f files.devel
 
 %changelog
+* Fri Jul 21 2017 Jonathan Lebon <jlebon@redhat.com> - 2017.7-3
+- Tweak new pkg name to rpm-ostree-libs to be more consistent with the main
+  package name and ostree's ostree-libs.
+
 * Fri Jul 21 2017 Colin Walters <walters@verbum.org> - 2017.7-2
 - Enable introspection, rename shared lib to librpmostree
   Due to an oversight, we were not actually building with introspection.
   Fix that.  And while we are here, split out a shared library package,
   so that e.g. containers can do `from gi.repository import RpmOstree`
-  without dragging in the systemd service, etc.
+  without dragging in the systemd service, etc. (RHBZ#1473701)
 
 * Mon Jul 10 2017 Jonathan Lebon <jlebon@redhat.com> - 2017.7-1
 - New upstream version