diff --git a/aarch64-support.diff b/aarch64-support.diff
new file mode 100644
index 0000000..ad1a91e
--- /dev/null
+++ b/aarch64-support.diff
@@ -0,0 +1,47 @@
+--- Imake.cf
++++ Imake.cf
+@@ -1022,6 +1022,10 @@
+ #   define AMD64Architecture
+ #  endif
+ # endif
++# if defined(__aarch64__)
++#   define AArch64Architecture
++#   undef __aarch64__
++# endif
+ #endif /* linux || __GLIBC__ */
+ 
+ #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
+--- linux.cf
++++ linux.cf
+@@ -976,6 +976,16 @@
+ # define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
+ #endif /* AMD64Architecture */
+ 
++#ifdef AArch64Architecture
++# ifndef OptimizedCDebugFlags
++#  define OptimizedCDebugFlags	DefaultGcc2AArch64Opt
++# endif
++# define LinuxMachineDefines   -D__aarch64__
++# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
++# define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
++#endif /* AArch64Architecture */
++
++
+ #ifndef StandardDefines
+ # ifdef __linux__
+ #  define StandardDefines	-Dlinux LinuxMachineDefines LinuxSourceDefines
+--- xfree86.cf
++++ xfree86.cf
+@@ -2022,6 +2022,12 @@
+ # endif
+ #endif
+ 
++#if HasGcc2 && defined(AArch64Architecture)
++# ifndef DefaultGcc2AArch64Opt
++#  define DefaultGcc2AArch64Opt -O2 -fno-strength-reduce GccAliasingArgs
++# endif
++#endif
++
+ #if HasGcc2 && defined(AlphaArchitecture)
+ # ifndef DefaultGcc2AxpOpt
+ #  define DefaultGcc2AxpOpt -O2 GccAliasingArgs
diff --git a/xorg-cf-files.changes b/xorg-cf-files.changes
index 26e08e8..1b768fe 100644
--- a/xorg-cf-files.changes
+++ b/xorg-cf-files.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Mar  1 10:58:34 UTC 2013 - dmueller@suse.com
+
+- add aarch64-support.diff:
+  Add support for aarch64 
+
 -------------------------------------------------------------------
 Tue Jun 26 10:03:03 UTC 2012 - sndirsch@suse.com
 
diff --git a/xorg-cf-files.spec b/xorg-cf-files.spec
index b2f43a6..dbabd0a 100644
--- a/xorg-cf-files.spec
+++ b/xorg-cf-files.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xorg-cf-files
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,6 +24,7 @@ License:        MIT
 Group:          Development/Tools/Building
 Url:            http://xorg.freedesktop.org/
 Source0:        http://xorg.freedesktop.org/releases/individual/util/%{name}-%{version}.tar.bz2
+Patch0:         aarch64-support.diff
 BuildRequires:  font-util >= 1.1
 BuildRequires:  pkgconfig(xorg-macros) >= 1.4
 Requires:       gccmakedep
@@ -51,6 +52,7 @@ converted.
 
 %prep
 %setup -q
+%patch0
 cat > host.def << EOF
 #define ConfigDir %_configdir
 #define XAppLoadDir /usr/share/X11/app-defaults
@@ -81,6 +83,10 @@ cat > host.def << EOF
 #undef  DefaultGcc2AMD64Opt
 #define DefaultGcc2AMD64Opt     $RPM_OPT_FLAGS -fno-strict-aliasing
 #endif
+#ifdef  AArch64Architecture
+#undef  DefaultGcc2AArch64Opt
+#define DefaultGcc2AArch64Opt   $RPM_OPT_FLAGS -fno-strict-aliasing
+#endif
 #ifdef  s390xArchitecture
 #undef  OptimizedCDebugFlags
 #define OptimizedCDebugFlags    $RPM_OPT_FLAGS -fno-strict-aliasing