diff --git a/srcpkgs/pipewire/patches/fix-building-when-systemd-is-false.patch b/srcpkgs/pipewire/patches/fix-building-when-systemd-is-false.patch
new file mode 100644
index 00000000000..5a1398d4636
--- /dev/null
+++ b/srcpkgs/pipewire/patches/fix-building-when-systemd-is-false.patch
@@ -0,0 +1,26 @@
+From 9c4d1422f29367be6fa21da2cb027ebe85466939 Mon Sep 17 00:00:00 2001
+From: maxice8 <thinkabit.ukim@gmail.com>
+Date: Thu, 22 Nov 2018 17:36:59 -0200
+Subject: [PATCH] meson: Fix configure when systemd option is set to false
+
+Otherwise it fails with systemd variable not found.
+---
+ src/daemon/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/daemon/meson.build b/src/daemon/meson.build
+index fb694e7c..f2a327fb 100644
+--- src/daemon/meson.build
++++ src/daemon/meson.build
+@@ -29,6 +29,6 @@ executable('pipewire',
+   dependencies : [pipewire_dep],
+ )
+ 
+-if systemd.found()
++if get_option('systemd') and systemd.found()
+   subdir('systemd')
+ endif
+-- 
+2.19.2
+
+
diff --git a/srcpkgs/pipewire/patches/remove-dependency-on-systemd_dep.patch b/srcpkgs/pipewire/patches/remove-dependency-on-systemd_dep.patch
new file mode 100644
index 00000000000..193d1d827f5
--- /dev/null
+++ b/srcpkgs/pipewire/patches/remove-dependency-on-systemd_dep.patch
@@ -0,0 +1,40 @@
+From 005e518af7e6bc116a78187d4221d6fd70621c41 Mon Sep 17 00:00:00 2001
+From: maxice8 <thinkabit.ukim@gmail.com>
+Date: Thu, 22 Nov 2018 18:07:53 -0200
+Subject: [PATCH] meson: don't add systemd_dep to dependencies if systemd
+ option is false.
+
+---
+ src/modules/meson.build | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/modules/meson.build b/src/modules/meson.build
+index 4dcb6e59..619ca2ec 100644
+--- src/modules/meson.build
++++ src/modules/meson.build
+@@ -71,6 +71,12 @@ pipewire_module_link_factory = shared_library('pipewire-module-link-factory',
+ #  dependencies : [glib_dep, gio_dep, mathlib, dl_lib, pipewire_dep],
+ #)
+ 
++pipewire_module_protocol_native_deps = [mathlib, dl_lib, pipewire_dep]
++
++if get_option('systemd')
++  pipewire_module_protocol_native_deps += systemd_dep
++endif
++
+ pipewire_module_protocol_native = shared_library('pipewire-module-protocol-native',
+   [ 'module-protocol-native.c',
+     'module-protocol-native/local-socket.c',
+@@ -81,7 +87,7 @@ pipewire_module_protocol_native = shared_library('pipewire-module-protocol-nativ
+   include_directories : [configinc, spa_inc],
+   install : true,
+   install_dir : modules_install_dir,
+-  dependencies : [mathlib, dl_lib, pipewire_dep, systemd_dep],
++  dependencies : pipewire_module_protocol_native_deps,
+ )
+ 
+ pipewire_module_audio_dsp = shared_library('pipewire-module-audio-dsp',
+-- 
+2.19.2
+
+
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 407f36d52e4..2cfbb649e36 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,9 +1,9 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.2.3
+version=0.2.4
 revision=1
 build_style=meson
-configure_args="-Dman=true -Dgstreamer=true -Ddocs=true -Dsystemd=false"
+configure_args="-Dman=true -Dgstreamer=enabled -Ddocs=true -Dsystemd=false"
 hostmakedepends="doxygen graphviz pkg-config xmltoman"
 makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel
  sbc-devel v4l-utils-devel libva-devel"
@@ -13,13 +13,7 @@ license="LGPL-2.1-or-later"
 homepage="https://pipewire.org/"
 changelog="https://raw.githubusercontent.com/PipeWire/pipewire/master/NEWS"
 distfiles="https://github.com/PipeWire/pipewire/archive/${version}.tar.gz"
-checksum=ffff3f4305791d19239cdba938b3432292802f8fe6f426577e159e11c68d95cb
-
-post_install() {
-	# Quick hack to get manapge to correct spot
-	vmkdir usr/share/man/man5
-	mv ${DESTDIR}/usr/share/man/man1/pipewire.conf.5 ${DESTDIR}/usr/share/man/man5
-}
+checksum=228487683f4a4553787eecff97276ac4ab6c3cace9ccf6514d1c30904b9b2f57
 
 libpipewire_package() {
 	short_desc+=" - pipewire library"