diff --git a/pipewire.changes b/pipewire.changes
index e7a0e0d..95c815c 100644
--- a/pipewire.changes
+++ b/pipewire.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Dec 16 16:42:31 UTC 2021 - Antonio Larrosa <alarrosa@suse.com>
+
+- Revert the merge of spa-plugins and modules into the library
+  package.
+- Move some of the files between packages where they make more
+  sense.
+- Rename the modules subpackage to modules-%{apiver_str} so
+  it can be versioned more easily (there still are some unversioned
+  files in the package, but it's a step in the right direction)
+
 -------------------------------------------------------------------
 Thu Dec 16 14:03:56 UTC 2021 - Antonio Larrosa <alarrosa@suse.com>
 
diff --git a/pipewire.spec b/pipewire.spec
index 8f4c926..bd74179 100644
--- a/pipewire.spec
+++ b/pipewire.spec
@@ -124,7 +124,7 @@ BuildRequires:  pkgconfig(vulkan)
 BuildRequires:  pkgconfig(webrtc-audio-processing)
 BuildRequires:  pkgconfig(x11)
 Requires:       %{libpipewire} = %{version}
-Requires:       %{name}-modules = %{version}
+Requires:       %{name}-modules-%{apiver_str} = %{version}
 Requires:       %{name}-session-manager
 Requires:       %{name}-spa-plugins-%{spa_ver_str} = %{version}
 Requires:       %{name}-spa-tools = %{version}
@@ -147,10 +147,8 @@ Some of its features include:
 Summary:        A Multimedia Framework designed to be an audio and video server and more
 Group:          System/Libraries
 Recommends:     pipewire >= %{version}
-Provides:       pipewire-modules = %{version}
-Obsoletes:      pipewire-modules < %{version}
-Provides:       pipewire-spa-plugins-%{spa_ver_str} = %{version}
-Obsoletes:      pipewire-spa-plugins-%{spa_ver_str} < %{version}
+Requires:       pipewire-modules-%{apiver_str} >= %{version}
+Requires:       pipewire-spa-plugins-%{spa_ver_str} >= %{version}
 
 %description -n %{libpipewire}
 PipeWire is a server and user space API to deal with multimedia pipelines.
@@ -233,6 +231,46 @@ SPA or Simple Plugin API is a plugin API.
 
 This package provides spa-inspect and spa-monitor tools.
 
+%package modules-%{apiver_str}
+Summary:        Modules For PipeWire, A Multimedia Framework
+Group:          Productivity/Multimedia/Other
+Provides:       %{name}-modules = %{version}
+Obsoletes:      %{name}-modules < %{version}
+
+%description modules-%{apiver_str}
+PipeWire is a server and user space API to deal with multimedia pipelines.
+
+The framework is used to build a modular daemon that can be configured to:
+
+ * Be a low-latency audio server with features like pulseaudio and/or jack;
+ * A video capture server that can manage hardware video capture devices
+   and provide access to them;
+ * A central hub where video can be made available for other applications
+   such as the gnome-shell screencast API.
+
+%package spa-plugins-%{spa_ver_str}
+Summary:        Plugins For PipeWire SPA
+Group:          Productivity/Multimedia/Other
+
+%description spa-plugins-%{spa_ver_str}
+PipeWire is a server and user space API to deal with multimedia pipelines.
+
+Some of its features include:
+
+ * Unlimited input/output ports;
+ * Per port format enumeration and negotiation;
+ * Enumeration/configuration of per port parameters;
+ * Application controlled buffer allocation with option to let the plugin
+   Allocate memory;
+ * Arbitrary buffer metadata;
+ * Buffers are passed around by id which is very fast and avoids the need
+   for refcounting;
+ * Synchronous and asynchronous processing;
+ * All api is designed to work without any allocations;
+ * Arbirary input/output behaviour.
+
+This package provides plugins for extending PipeWire SPA's functionality.
+
 %package devel
 Summary:        Development Files For PipeWire, A Multimedia Framework
 Group:          Development/Libraries/C and C++
@@ -455,6 +493,8 @@ if [ ! -e %{_bindir}/pw-jack-%{apiver} ] ; then
 fi
 
 %files
+%license LICENSE COPYING
+%doc README.md
 %{_bindir}/pipewire
 %{_userunitdir}/pipewire.service
 %{_userunitdir}/pipewire.socket
@@ -462,9 +502,8 @@ fi
 %{_mandir}/man5/pipewire.conf.5%{ext_man}
 %dir %{_datadir}/pipewire/
 %{_datadir}/pipewire/pipewire.conf
-%{_datadir}/pipewire/client.conf
-%{_datadir}/pipewire/client-rt.conf
-%{_datadir}/pipewire/pipewire-pulse.conf
+%dir %{_datadir}/pipewire/filter-chain/
+%{_datadir}/pipewire/filter-chain/*.conf
 %ghost %dir %{_localstatedir}/lib/pipewire/
 %ghost %{_localstatedir}/lib/pipewire/pipewire_post_workaround
 
@@ -472,18 +511,21 @@ fi
 %license LICENSE COPYING
 %doc README.md
 %{_libdir}/libpipewire-%{apiver}.so.*
-%{_udevrulesdir}/90-pipewire-alsa.rules
 
+%files modules-%{apiver_str}
 %dir %{_libdir}/pipewire-%{apiver}
 %{_libdir}/pipewire-%{apiver}/libpipewire-module-*.so
 %dir %{_libdir}/pipewire-%{apiver}/v4l2/
 %{_libdir}/pipewire-%{apiver}/v4l2/libpw-v4l2.so
+
 %dir %{_datadir}/alsa-card-profile/
 %dir %{_datadir}/alsa-card-profile/mixer/
 %{_datadir}/alsa-card-profile/mixer/*
-%dir %{_datadir}/pipewire/filter-chain/
-%{_datadir}/pipewire/filter-chain/*.conf
+%{_udevrulesdir}/90-pipewire-alsa.rules
+%{_datadir}/pipewire/client.conf
+%{_datadir}/pipewire/client-rt.conf
 
+%files spa-plugins-%{spa_ver_str}
 %dir %{_libdir}/spa-%{spa_ver}/
 %{_libdir}/spa-%{spa_ver}/alsa/
 %{_libdir}/spa-%{spa_ver}/audioconvert/
@@ -585,6 +627,7 @@ fi
 %{_bindir}/pipewire-pulse
 %{_mandir}/man1/pipewire-pulse.1%{ext_man}
 %{_userunitdir}/pipewire-pulse.*
+%{_datadir}/pipewire/pipewire-pulse.conf
 %ghost %{_localstatedir}/lib/pipewire/pipewire-pulseaudio_post_workaround
 
 %files alsa