diff --git a/ComputeLibrary.spec b/ComputeLibrary.spec
index dd0dbad..367e6ad 100644
--- a/ComputeLibrary.spec
+++ b/ComputeLibrary.spec
@@ -13,7 +13,7 @@ BuildRequires:  git-core
 BuildRequires:  ocl-icd-devel
 BuildRequires:  scons >= 2.4
 Recommends:     %{name}-sample-data
-ExclusiveArch:  aarch64 armv7l armv7hl x86_64
+ExclusiveArch:  aarch64 x86_64
 
 %description
 A software library for computer vision and machine learning.
@@ -69,9 +69,7 @@ Free *.npy and *.ppm files to use with example binaries.
 %autosetup -p1 -n ComputeLibrary-%{version}
 
 %build
-scons os=linux \
-      build=native \
-      install_dir=install \
+scons os=linux build=native \
       set_soname=1 \
       examples=1 \
       opencl=1 \
@@ -80,12 +78,9 @@ scons os=linux \
 %else
       validation_tests=0 \
 %endif
-%ifarch aarch64 aarch64_ilp32
+%ifarch aarch64
       neon=1 arch=arm64-v8a \
 %endif
-%ifarch armv7l armv7hl
-      neon=0 arch=armv7a \
-%endif
 %ifarch x86_64
       neon=0 arch=x86_64 \
 %endif
@@ -101,9 +96,8 @@ mkdir -p %{buildroot}%{_bindir}
 install -Dm0755 build/examples/* %{buildroot}%{_bindir}/
 mkdir -p %{buildroot}%{_libdir}
 cp -a build/*.so* %{buildroot}%{_libdir}/
-# FIXME: scons should install headers thanks to: install_dir=%%{buildroot}%%{_prefix} but this is broken
 mkdir -p %{buildroot}%{_includedir}/
-cp -a arm_compute/ support/ utils/ include/half/ include/libnpy/ %{buildroot}%{_includedir}/
+cp -a arm_compute/ include/half/ include/libnpy/ support/ utils/ %{buildroot}%{_includedir}/
 # Remove *.cpp files from includedir
 rm -f $(find %{buildroot}%{_includedir}/ -name *.cpp)
 # Install sample data
@@ -111,7 +105,6 @@ mkdir -p %{buildroot}%{_datadir}/ComputeLibrary/%{sampledir}
 cp -r data/* %{buildroot}%{_datadir}/ComputeLibrary/%{sampledir}
 # Install scripts
 install -Dm0755 scripts/* %{buildroot}%{_bindir}
-rm -f %{buildroot}%{_bindir}/*.h
 # Fix Python scripts interpreter
 for pyfile in `ls %{buildroot}%{_bindir}/*.py`; do
   sed -i -e 's|#!%{_bindir}/env python|#!%{_bindir}/python|' $pyfile