diff --git a/AUTHORS b/AUTHORS
index 9efac2e29f564b9793f5890c088ff4b3ca932608..5a4e4955dab8021329e1eb41270b9237ba8fdbaa 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -237,6 +237,7 @@ Patches have also been contributed by:
   Beat Jörg            <Beat.Joerg@ssatr.ch>
   Gao feng             <gaofeng@cn.fujitsu.com>
   Dipankar Sarma       <dipankar@in.ibm.com>
+  Viktor Mihajlovski   <mihajlov@linux.vnet.ibm.com>
 
   [....send patches to get your name here....]
 
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 95d6823b578f994dbc420d15e582d900ad0f0d14..ae26967083321207599fd39a8d73ab96bab4f31f 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1496,6 +1496,11 @@ int qemuCapsExtractVersionInfo(const char *qemu, const char *arch,
         qemuCapsSet(flags, QEMU_CAPS_PCI_MULTIBUS);
     }
 
+    /* S390 and probably other archs do not support no-acpi -
+       maybe the qemu option parsing should be re-thought. */
+    if (STRPREFIX(arch, "s390"))
+        qemuCapsClear(flags, QEMU_CAPS_NO_ACPI);
+
     /* qemuCapsExtractDeviceStr will only set additional flags if qemu
      * understands the 0.13.0+ notion of "-device driver,".  */
     if (qemuCapsGet(flags, QEMU_CAPS_DEVICE) &&