diff --git a/gpaw.spec b/gpaw.spec
index e298eb7..8edab9a 100644
--- a/gpaw.spec
+++ b/gpaw.spec
@@ -17,7 +17,7 @@ ExcludeArch: ppc64
 
 Name:			gpaw
 Version:		1.1.0
-Release:		23%{?dist}
+Release:		24%{?dist}
 Summary:		A grid-based real-space PAW method DFT code
 
 License:		GPLv3+
@@ -25,46 +25,32 @@ URL:			https://wiki.fysik.dtu.dk/gpaw/
 Source0:		https://gitlab.com/%{name}/%{name}/repository/archive.tar.gz?ref=%{version}#/%{name}-%{version}-%{upstream_commit}.tar.gz
 
 BuildRequires:		time
+BuildRequires:		libxc-devel
+BuildRequires:		hdf5-devel
+BuildRequires:		python2-devel
+BuildRequires:		python-ase
 
-%ifarch %arm
-BuildRequires:		atlas-devel
-%else
-%ifarch aarch64
-BuildRequires:		atlas-devel
-%else
-%ifarch ppc64
+%ifarch ppc64 s390x
 BuildRequires:		atlas-devel
 %else
 BuildRequires:		openblas-devel
 %endif
-%endif
-%endif
-
-BuildRequires:		libxc-devel
-BuildRequires:		hdf5-devel
 
-BuildRequires:		python2-devel
 %if 0%{?with_python3}
 BuildRequires:		python3-devel
+BuildRequires:		python3-scipy
+BuildRequires:		python3-ase
 %endif # if with_python3
+
 # no scipy on el6 ppc64
 %if 0%{?el6}
-%ifarch ppc64
-%{nil}
-%else
+%ifnarch ppc64
 BuildRequires:		scipy
 %endif
 %else
 BuildRequires:		scipy
 %endif
-%if 0%{?with_python3}
-BuildRequires:		python3-scipy
-%endif # if with_python3
 
-BuildRequires:		python-ase
-%if 0%{?with_python3}
-BuildRequires:		python3-ase
-%endif # if with_python3
 
 BuildRequires:		%{name}-setups
 
@@ -429,6 +415,10 @@ popd
 
 
 %changelog
+* Wed Jul 13 2016 Peter Robinson <pbrobinson@fedoraproject.org> 1.1.0-24
+- aarch64 has openblas now
+- simplify arch conditionals
+
 * Wed Jul  6 2016 Marcin Dulak <Marcin.Dulak@gmail.com> - 1.1.0-23
 - gpaw-1.1.0