diff --git a/common/shlibs b/common/shlibs
index f6df50b287c..2e41ae5d206 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3146,8 +3146,8 @@ libarcan_shmif_server.so.0.11 arcan-0.5.4.3_1
 libarcan_tui.so.0.11 arcan-0.5.4.3_1
 libldm.so.1 linux-driver-management-1.0.1_1
 liblwipv6.so.2 lwipv6-1.5a_1
-libpipewire-0.1.so.0 pipewire-0.1.7_1
-libspa-lib.so.0 pipewire-0.1.7_1
+libpipewire-0.1.so.0 libpipewire-0.1.9_1
+libspa-lib.so.0 libspa-lib-0.1.9_1
 libvolk.so.1.4 volk-1.4_1
 libgnuradio-runtime-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1
 libgnuradio-pmt-3.7.13.3.so.0.0.0 gnuradio-3.7.13.3_1
diff --git a/srcpkgs/gstreamer1-pipewire b/srcpkgs/gstreamer1-pipewire
new file mode 120000
index 00000000000..c9c97cf6707
--- /dev/null
+++ b/srcpkgs/gstreamer1-pipewire
@@ -0,0 +1 @@
+pipewire
\ No newline at end of file
diff --git a/srcpkgs/libpipewire b/srcpkgs/libpipewire
new file mode 120000
index 00000000000..c9c97cf6707
--- /dev/null
+++ b/srcpkgs/libpipewire
@@ -0,0 +1 @@
+pipewire
\ No newline at end of file
diff --git a/srcpkgs/libspa-bluetooth b/srcpkgs/libspa-bluetooth
new file mode 120000
index 00000000000..c9c97cf6707
--- /dev/null
+++ b/srcpkgs/libspa-bluetooth
@@ -0,0 +1 @@
+pipewire
\ No newline at end of file
diff --git a/srcpkgs/libspa-ffmpeg b/srcpkgs/libspa-ffmpeg
new file mode 120000
index 00000000000..c9c97cf6707
--- /dev/null
+++ b/srcpkgs/libspa-ffmpeg
@@ -0,0 +1 @@
+pipewire
\ No newline at end of file
diff --git a/srcpkgs/libspa-lib b/srcpkgs/libspa-lib
new file mode 120000
index 00000000000..c9c97cf6707
--- /dev/null
+++ b/srcpkgs/libspa-lib
@@ -0,0 +1 @@
+pipewire
\ No newline at end of file
diff --git a/srcpkgs/libspa-lib-devel b/srcpkgs/libspa-lib-devel
new file mode 120000
index 00000000000..c9c97cf6707
--- /dev/null
+++ b/srcpkgs/libspa-lib-devel
@@ -0,0 +1 @@
+pipewire
\ No newline at end of file
diff --git a/srcpkgs/pipewire-doc b/srcpkgs/pipewire-doc
new file mode 120000
index 00000000000..c9c97cf6707
--- /dev/null
+++ b/srcpkgs/pipewire-doc
@@ -0,0 +1 @@
+pipewire
\ No newline at end of file
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index d60347d2f8a..9abfb0ceac1 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,27 +1,78 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.1.9
-revision=1
-configure_args="-Denable_man=true -Denable_gstreamer=false"
+revision=2
+configure_args="-Denable_man=true -Denable_gstreamer=true -Denable_docs=true"
 build_style=meson
-hostmakedepends="pkg-config xmltoman"
-makedepends="dbus-devel jack-devel alsa-lib-devel v4l-utils-devel SDL2-devel
- ffmpeg-devel libX11-devel"
+hostmakedepends="doxygen graphviz pkg-config xmltoman"
+makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel
+ sbc-devel v4l-utils-devel"
 short_desc="Server and user space API to deal with multimedia pipelines"
 maintainer="maxice8 <thinkabit.ukim@gmail.com>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="https://pipewire.org/"
 distfiles="https://github.com/PipeWire/pipewire/archive/${version}.tar.gz"
 checksum=d7dc591d60c3544f3c24b2b0ab1db458991dd69d0610337fd0accf136373916b
 
-# XXX: There is potential to further divide into more subpkgs one for libpipewire
-# and another for libspa
-pipewire-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
+libpipewire_package() {
+	short_desc+=" - pipewire library"
 	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
+		vmove "usr/lib/libpipewire-0.1.so.*"
+	}
+}
+
+pipewire-devel_package() {
+	depends="libpipewire-${version}_${revision}"
+	short_desc+=" - pipewire development files"
+	pkg_install() {
+		vmove usr/include/pipewire
+		vmove usr/lib/pkgconfig/libpipewire-0.1.pc
+		vmove usr/lib/libpipewire-0.1.so
+	}
+}
+
+libspa-lib_package() {
+	short_desc+=" - spa-lib library"
+	pkg_install() {
+		vmove "usr/lib/libspa-lib.so.*"
+	}
+}
+
+libspa-lib-devel_package() {
+	depends="libspa-lib-${version}_${revision}"
+	short_desc+=" - spa-lib development files"
+	pkg_install() {
+		vmove usr/include/spa
+		vmove usr/lib/libspa-lib.so
+		vmove usr/lib/pkgconfig/libspa-0.1.pc
+	}
+}
+
+libspa-ffmpeg_package() {
+	short_desc+=" - ffmpeg plugins"
+	pkg_install() {
+		vmove usr/lib/spa/ffmpeg
+	}
+}
+
+libspa-bluetooth_package() {
+	short_desc+=" - bluetooth plugins"
+	pkg_install() {
+		vmove usr/lib/spa/bluez5
+	}
+}
+
+gstreamer1-pipewire_package() {
+	short_desc+=" - gstreamer plugin"
+	pkg_install() {
+		vmove usr/lib/gstreamer-1.0
+	}
+}
+
+pipewire-doc_package() {
+	noarch=yes
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share/doc
 	}
 }