diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index 9f08f0eb138..a48e56321f7 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,7 +1,7 @@
 # Template file for 'xen'
 pkgname=xen
 version=4.14.1
-revision=8
+revision=9
 # grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
 _git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63
 # TODO: arm / aarch64
@@ -11,8 +11,8 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
  --with-system-seabios=/usr/share/seabios/bios.bin
  --with-sysconfig-leaf-dir=conf.d --with-rundir=/run"
 hostmakedepends="acpica-utils automake bin86 bison fig2dev flex gettext
- ghostscript git ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar
- texinfo wget"
+ ghostscript git ocaml ocaml-findlib pandoc pkg-config tar texinfo wget
+ python3-Markdown python3-setuptools"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
  libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel
@@ -129,17 +129,22 @@ post_extract() {
 			ocaml-${_ocaml_version}.tar.gz \
 			stubdom/
 	fi
+
+	cp -a ${FILESDIR}/*.h ${wrksrc}/tools/firmware
+	cp -a ${FILESDIR}/stdint_local.h ${wrksrc}/tools/libxl/
+}
+
+post_patch() {
+	find \( -name "Makefile*" -o -name "*.mk" -o -name "common.make" \) -exec \
+		sed -i "{}" -e "s; *-Werror *; ;g" \
+		-e "s;-Wdeclaration-after-statement;-Wno-declaration-after-statement;g" \;
+	vsed -i tools/python/setup.py -e 's;, "-Werror";;g'
+	# Silence a stream edit for dependencies
+	vsed -i Config.mk -e 's;sed ";@&;'
 }
 
 do_configure() {
 	unset AR OBJCOPY RANLIB CC LD CFLAGS LDFLAGS
-	find \( -name "Makefile*" -o -name "*.mk" -o -name "common.make" \) \
-		-exec sed -i "{}" -e "s; *-Werror *; ;g" \;
-	vsed -i tools/python/setup.py -e 's;, "-Werror";;g'
-	# Silence a stream edit for dependencies
-	vsed -i Config.mk -e 's;sed ";@&;'
-	cp -a ${FILESDIR}/*.h ${wrksrc}/tools/firmware
-	cp -a ${FILESDIR}/stdint_local.h ${wrksrc}/tools/libxl/
 	rm -f ${XBPS_WRAPPERDIR}/strip
 	./autogen.sh
 	./configure ${configure_args}