diff --git a/cfitsio-aarch64.patch b/cfitsio-aarch64.patch
new file mode 100644
index 0000000..54731f3
--- /dev/null
+++ b/cfitsio-aarch64.patch
@@ -0,0 +1,22 @@
+diff --git a/fitsio2.h b/fitsio2.h
+index 27793a7..66e4bcb 100644
+--- a/fitsio2.h
++++ b/fitsio2.h
+@@ -96,7 +96,7 @@ extern int Fitsio_Pthread_Status;
+ #define BYTESWAPPED FALSE
+ #define LONGSIZE 32
+ 
+-#elif defined(__ia64__)  || defined(__x86_64__)
++#elif defined(__ia64__)  || defined(__x86_64__) || defined(__AARCH64EL__)
+                   /*  Intel itanium 64-bit PC, or AMD opteron 64-bit PC */
+ #define BYTESWAPPED TRUE
+ #define LONGSIZE 64   
+@@ -107,7 +107,7 @@ extern int Fitsio_Pthread_Status;
+ #define MACHINE NATIVE
+ #define LONGSIZE 64
+ 
+-#elif defined(__powerpc64__) || defined(__64BIT__) /* IBM 64-bit AIX powerpc*/
++#elif defined(__powerpc64__) || defined(__64BIT__) || defined(__AARCH64EB__) /* IBM 64-bit AIX powerpc*/
+                               /* could also test for __ppc64__ or __PPC64 */
+ #define BYTESWAPPED FALSE
+ #define MACHINE NATIVE
diff --git a/cfitsio.spec b/cfitsio.spec
index 93c4b2d..7b8b38c 100644
--- a/cfitsio.spec
+++ b/cfitsio.spec
@@ -1,6 +1,6 @@
 Name: cfitsio
 Version: 3.360
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Library for manipulating FITS data files
 Group: Development/Libraries
 License: MIT
@@ -12,6 +12,8 @@ Patch0: cfitsio-zlib.patch
 Patch1: cfitsio-noversioncheck.patch
 # Some rearrangements in pkg-config file
 Patch2: cfitsio-pkgconfig.patch
+# AArch64 platform definitions
+Patch3: cfitsio-aarch64.patch
 
 BuildRequires:     gcc-gfortran zlib-devel
 Requires(post):    /sbin/ldconfig
@@ -79,6 +81,7 @@ compression algorithm.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # remove bundled zlib
 # not all the files inside zlib belong to zlib
@@ -140,6 +143,9 @@ chmod 755 %{buildroot}%{_bindir}/f{,un}pack
 %{_bindir}/funpack
 
 %changelog
+* Tue Apr 15 2014 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 3.360-2
+- Add AArch64 support.
+
 * Mon Dec 09 2013 Sergio Pascual <sergiopr@fedoraproject.org> - 3.360-1
 - New upstream (3.360)