diff --git a/hardware/disk/dmapi/actions.py b/hardware/disk/dmapi/actions.py
index b7effaed99..bcb063bf07 100644
--- a/hardware/disk/dmapi/actions.py
+++ b/hardware/disk/dmapi/actions.py
@@ -13,6 +13,7 @@ from pisi.actionsapi import get
 def setup():
     shelltools.export("OPTIMIZER", get.CFLAGS())
     shelltools.export("DEBUG", "-DNDEBUG")
+    pisitools.cflags.add("-fPIC")
 
     autotools.autoconf()
     autotools.configure("--libexecdir=/usr/lib \
diff --git a/hardware/disk/dmapi/files/dmapi-add-missing-includes-to-handle2path.patch b/hardware/disk/dmapi/files/dmapi-add-missing-includes-to-handle2path.patch
new file mode 100644
index 0000000000..8c8597502d
--- /dev/null
+++ b/hardware/disk/dmapi/files/dmapi-add-missing-includes-to-handle2path.patch
@@ -0,0 +1,24 @@
+From: Jeff Mahoney <jeffm@suse.com>
+Subject: dmapi: add missing includes to handle2path
+
+The update to xfsprogs 4.2.0 removed some includes from its own headers, so
+those headers need to be added manually to dmapi.
+
+Signed-off-by: Jeff Mahoney <jeffm@suse.com>
+---
+ libdm/dm_handle2path.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/libdm/dm_handle2path.c
++++ b/libdm/dm_handle2path.c
+@@ -16,6 +16,10 @@
+  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
++#include <sys/stat.h>
++#include <fcntl.h>
++#include <string.h>
++#include <unistd.h>
+ #include <dmapi.h>
+ #include <dmapi_kern.h>
+ #include "dmapi_lib.h"
diff --git a/hardware/disk/dmapi/pspec.xml b/hardware/disk/dmapi/pspec.xml
index 53914b9140..2026d47661 100644
--- a/hardware/disk/dmapi/pspec.xml
+++ b/hardware/disk/dmapi/pspec.xml
@@ -17,6 +17,9 @@
             <Dependency>xfsprogs-devel</Dependency>
             <Dependency>libutil-linux-devel</Dependency>
         </BuildDependencies>
+        <Patches>
+            <Patch level="1">dmapi-add-missing-includes-to-handle2path.patch</Patch>
+        </Patches>
     </Source>
 
     <Package>