diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes
index 42d95433..d7f46d0d 100644
--- a/qemu-testsuite.changes
+++ b/qemu-testsuite.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jul 19 20:57:17 UTC 2016 - afaerber@suse.de
+
+- Clean up the udev ifdeffery to cover systemd as well (boo#860275)
+- Trigger udev rules also under systemd (boo#989655)
+- Suppress s390x sysctl in chroot
+- Ignore s390x sysctl failures (agraf)
+
 -------------------------------------------------------------------
 Thu Jul 14 19:38:39 UTC 2016 - brogers@suse.com
 
diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec
index fa67f907..8541e0ba 100644
--- a/qemu-testsuite.spec
+++ b/qemu-testsuite.spec
@@ -1136,20 +1136,20 @@ install -D -m 644 check-report.xml %{buildroot}%{_datadir}/qemu/check-report.xml
 
 %if %{kvm_available}
 %post
-if [ "$(readlink -f /proc/1/root)" = "/" ]; then
+# Do not execute operations affecting host devices while running in a chroot
+if [ $(stat -L -c "%i" /proc/1/root/) = $(stat -L -c "%i" /) ]; then
   setfacl --remove-all /dev/kvm &> /dev/null || :
-fi
 %if 0%{?with_systemd}
-%udev_rules_update
+  %udev_rules_update
+  %_bindir/udevadm trigger || :
 %else
-if [ "$(readlink -f /proc/1/root)" = "/" ]; then
   /sbin/udevadm control --reload-rules  || :
   /sbin/udevadm trigger || :
-fi
 %endif
 %ifarch s390x
-sysctl vm.allocate_pgste=1
+  sysctl vm.allocate_pgste=1 || :
 %endif
+fi
 %endif
 
 %if 0%{?suse_version} >= 1130
diff --git a/qemu.changes b/qemu.changes
index 42d95433..d7f46d0d 100644
--- a/qemu.changes
+++ b/qemu.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jul 19 20:57:17 UTC 2016 - afaerber@suse.de
+
+- Clean up the udev ifdeffery to cover systemd as well (boo#860275)
+- Trigger udev rules also under systemd (boo#989655)
+- Suppress s390x sysctl in chroot
+- Ignore s390x sysctl failures (agraf)
+
 -------------------------------------------------------------------
 Thu Jul 14 19:38:39 UTC 2016 - brogers@suse.com
 
diff --git a/qemu.spec b/qemu.spec
index d4a833db..67533a3c 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -1136,20 +1136,20 @@ install -D -m 644 check-report.xml %{buildroot}%{_datadir}/qemu/check-report.xml
 
 %if %{kvm_available}
 %post
-if [ "$(readlink -f /proc/1/root)" = "/" ]; then
+# Do not execute operations affecting host devices while running in a chroot
+if [ $(stat -L -c "%i" /proc/1/root/) = $(stat -L -c "%i" /) ]; then
   setfacl --remove-all /dev/kvm &> /dev/null || :
-fi
 %if 0%{?with_systemd}
-%udev_rules_update
+  %udev_rules_update
+  %_bindir/udevadm trigger || :
 %else
-if [ "$(readlink -f /proc/1/root)" = "/" ]; then
   /sbin/udevadm control --reload-rules  || :
   /sbin/udevadm trigger || :
-fi
 %endif
 %ifarch s390x
-sysctl vm.allocate_pgste=1
+  sysctl vm.allocate_pgste=1 || :
 %endif
+fi
 %endif
 
 %if 0%{?suse_version} >= 1130
diff --git a/qemu.spec.in b/qemu.spec.in
index ef14f6dd..4f45411e 100644
--- a/qemu.spec.in
+++ b/qemu.spec.in
@@ -1017,20 +1017,20 @@ install -D -m 644 check-report.xml %{buildroot}%{_datadir}/qemu/check-report.xml
 
 %if %{kvm_available}
 %post
-if [ "$(readlink -f /proc/1/root)" = "/" ]; then
+# Do not execute operations affecting host devices while running in a chroot
+if [ $(stat -L -c "%i" /proc/1/root/) = $(stat -L -c "%i" /) ]; then
   setfacl --remove-all /dev/kvm &> /dev/null || :
-fi
 %if 0%{?with_systemd}
-%udev_rules_update
+  %udev_rules_update
+  %_bindir/udevadm trigger || :
 %else
-if [ "$(readlink -f /proc/1/root)" = "/" ]; then
   /sbin/udevadm control --reload-rules  || :
   /sbin/udevadm trigger || :
-fi
 %endif
 %ifarch s390x
-sysctl vm.allocate_pgste=1
+  sysctl vm.allocate_pgste=1 || :
 %endif
+fi
 %endif
 
 %if 0%{?suse_version} >= 1130