diff --git a/hxtools-20140325-remove-conflicting-types-include.patch b/hxtools-20140325-remove-conflicting-types-include.patch
new file mode 100644
index 0000000..92686dc
--- /dev/null
+++ b/hxtools-20140325-remove-conflicting-types-include.patch
@@ -0,0 +1,18 @@
+Index: hxtools-20140325/sadmin/xfs_irecover.c
+===================================================================
+--- hxtools-20140325.orig/sadmin/xfs_irecover.c
++++ hxtools-20140325/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;
diff --git a/hxtools.spec b/hxtools.spec
index d02bc0c..1bf2d1e 100644
--- a/hxtools.spec
+++ b/hxtools.spec
@@ -13,6 +13,7 @@ URL:            http://inai.de/projects/hxtools/
 # xzdec hxtools-20130605.tar.xz | gpg --verify hxtools-20130605.tar.asc -
 Source0:        http://inai.de/files/hxtools/hxtools-%{version}.tar.xz
 #Source1:        http://inai.de/files/hxtools/hxtools-%{version}.tar.asc
+Patch0:         hxtools-20140325-remove-conflicting-types-include.patch
 BuildRequires:  libHX-devel
 # for sys/capability.h in printcaps.c
 BuildRequires:  libcap-devel
@@ -37,10 +38,11 @@ Currently only these tools are included in Fedora:
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%configure
-make %{?_smp_mflags} V=1
+%configure --disable-silent-rules
+make %{?_smp_mflags}
 
 %install
 %make_install
@@ -192,8 +194,8 @@ rm "%{buildroot}%{_mandir}/man8/xfs_irecover.8"*
 
 %files
 %doc LICENSE.GPL2 LICENSE.GPL3
-%{_bindir}/ofl
 %{_bindir}/git-forest
+%{_bindir}/ofl
 %{_libexecdir}/hxtools/fd0ssh
 %{_mandir}/man1/fd0ssh.1*
 %{_mandir}/man1/git-forest.1*
@@ -202,6 +204,7 @@ rm "%{buildroot}%{_mandir}/man8/xfs_irecover.8"*
 %changelog
 * Thu Jun 19 2014 Christopher Meng <rpm@cicku.me> - 20140325-1
 - Update to 20140325
+- Fix conflicting types include on AArch64.
 
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20130605-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild