diff --git a/hxtools.changes b/hxtools.changes
index b2176e6..13e64d5 100644
--- a/hxtools.changes
+++ b/hxtools.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr  3 11:21:18 UTC 2014 - dmueller@suse.com
+
+- add remove-conflicting-types.diff, fixes build 
+  failure on aarch64
+
 -------------------------------------------------------------------
 Tue Mar 25 18:41:41 UTC 2014 - jengelh@inai.de
 
diff --git a/hxtools.spec b/hxtools.spec
index f1f9a9f..582a32d 100644
--- a/hxtools.spec
+++ b/hxtools.spec
@@ -27,6 +27,7 @@ Url:            http://inai.de/projects/hxtools/
 Source:         http://jftp.inai.de/hxtools/%name-%version.tar.xz
 Source2:        http://jftp.inai.de/hxtools/%name-%version.tar.asc
 Source3:        %name.keyring
+Patch0:         remove-conflicting-types.diff
 # This package has a "Upstream First" policy for patches.
 # See https://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 BuildRequires:  fdupes
@@ -162,6 +163,7 @@ an entire mount.
 
 %prep
 %setup -q
+%patch0
 
 %build
 %configure
diff --git a/remove-conflicting-types.diff b/remove-conflicting-types.diff
new file mode 100644
index 0000000..b2e481c
--- /dev/null
+++ b/remove-conflicting-types.diff
@@ -0,0 +1,16 @@
+--- sadmin/xfs_irecover.c
++++ sadmin/xfs_irecover.c
+@@ -42,12 +42,7 @@
+ #include <libHX/proc.h>
+ #include <libHX/string.h>
+ #include <arpa/inet.h>
+-
+-typedef int8_t __s8;
+-typedef uint8_t __u8;
+-typedef uint16_t __be16;
+-typedef uint32_t __be32;
+-typedef uint64_t __be64;
++#include <linux/types.h>
+ 
+ struct work_info {
+ 	char *device;