diff --git a/Mesa.changes b/Mesa.changes
index 6f92fce..74b863d 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 14 12:02:29 UTC 2016 - dmueller@suse.com
+
+- enable llvmpipe for aarch64 (fate#320649)
+
 -------------------------------------------------------------------
 Thu Feb 11 13:18:31 UTC 2016 - mimi.vx@gmail.com
 
diff --git a/Mesa.spec b/Mesa.spec
index 63d9a12..6856b1c 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -131,7 +131,7 @@ BuildRequires:  pkgconfig(libdrm_intel) >= 2.4.61
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-server)
 %endif
-%ifarch %arm ppc64 ppc64le s390x %ix86 x86_64
+%ifarch aarch64 %arm ppc64 ppc64le s390x %ix86 x86_64
 BuildRequires:  llvm-devel
 BuildRequires:  ncurses-devel
 %endif
@@ -624,11 +624,11 @@ autoreconf -fvi
            --with-dri-drivers=nouveau,r200,radeon \
            --with-gallium-drivers=r300,r600,nouveau,swrast \
 %endif
-%ifarch s390 aarch64
+%ifarch s390
            --with-dri-drivers=swrast \
            --with-gallium-drivers=swrast \
 %endif
-%ifarch s390x
+%ifarch aarch64 s390x
         --enable-xa \
         --enable-gallium-llvm \
         --with-dri-drivers=swrast \
@@ -689,7 +689,7 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
 
 %postun -n libgbm1 -p /sbin/ldconfig
 
-%ifarch %ix86 x86_64 %arm ppc64 ppc64le s390x
+%ifarch aarch64 %ix86 x86_64 %arm ppc64 ppc64le s390x
 %post   -n libxatracker2 -p /sbin/ldconfig
 
 %postun -n libxatracker2 -p /sbin/ldconfig
@@ -844,7 +844,7 @@ install -m 644 $RPM_SOURCE_DIR/README.updates \
 %{_libdir}/libgbm.so
 %{_libdir}/pkgconfig/gbm.pc
 
-%ifarch %ix86 x86_64 %arm ppc64 ppc64le s390x
+%ifarch aarch64 %ix86 x86_64 %arm ppc64 ppc64le s390x
 %files -n libxatracker2
 %defattr(-,root,root)
 %{_libdir}/libxatracker.so.2*