diff --git a/AppStream.changes b/AppStream.changes
index db16fd0..03cdd77 100644
--- a/AppStream.changes
+++ b/AppStream.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Oct 16 15:08:27 UTC 2023 - Antonio Larrosa <alarrosa@suse.com>
+
+- Fix the documentation being put in the devel subpackage while
+  the doc subpackage was empty. I think the doc %files section was
+  probably removed inadvertently since it wasn't mentioned in the
+  changelog and the doc subpackage declaration was left around.
+- Moved the appstreamcli-compose man page to the same package
+  as the binary.
+- Make AppStream-compose-devel explicitly require 
+  libappstream-compose0 to stop rpmlint from reporting an error.
+
 -------------------------------------------------------------------
 Tue Oct  3 05:30:07 UTC 2023 - Antonio Larrosa <alarrosa@suse.com>
 
diff --git a/AppStream.spec b/AppStream.spec
index 3ecb1c2..982a00a 100644
--- a/AppStream.spec
+++ b/AppStream.spec
@@ -117,6 +117,7 @@ License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
 Requires:       AppStream-compose = %{version}
+Requires:       libappstream-compose%{libappstream_compose_sover}
 
 %description compose-devel
 This package contains all necessary files, libraries,
@@ -224,6 +225,7 @@ rm -r %{buildroot}%{_datadir}/installed-tests
 %files compose
 %{_datadir}/metainfo/org.freedesktop.appstream.compose.metainfo.xml
 %{_libexecdir}/appstreamcli-compose
+%{_mandir}/man1/appstreamcli-compose*.1.gz
 
 %files -n libappstream-compose%{libappstream_compose_sover}
 %{_libdir}/libappstream-compose.so.%{version}
@@ -247,8 +249,9 @@ rm -r %{buildroot}%{_datadir}/installed-tests
 %{_datadir}/vala/vapi/appstream.deps
 %{_datadir}/vala/vapi/appstream.vapi
 %endif
+
+%files doc
 %{_datadir}/doc/appstream
-%{_mandir}/man1/appstreamcli-compose*.1.gz
 
 %files -n typelib-1_0-AppStream-1.0
 %{_libdir}/girepository-1.0/AppStream-1.0.typelib