diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 2a5943f..173cbfe 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -47,6 +47,12 @@ sha256sums=(
 prepare() {
   cd firewalld
   git cherry-pick -n 3337c9a4e63bd42535b6b3e97a91f4b502c063ce
+  git cherry-pick -n 4268db46e98fd3bced2da6e1b8cdf12be3f4e3a6
+  git cherry-pick -n 63e2bfd4ba17626cdc1cb98ea8e727e09c6c144b
+  git cherry-pick -n e4dc44fcfd214b27c718eb4d99d3b137495b9626
+  git cherry-pick -n faaf3ac649a347f0bccae800fd0e4daeebbd1539
+  git cherry-pick -n 5b4e8918715a1d2e4abf77ed4eb3252486a19109
+  git cherry-pick -n 36f3d50d729d3329ce99653d8227e3f52a02a43f
   patch -Np1 -i ../firewalld-sysconfigdir.patch
   NOCONFIGURE=true ./autogen.sh
 }