diff --git a/arbor.spec b/arbor.spec
index 7f70711..bf2c25c 100644
--- a/arbor.spec
+++ b/arbor.spec
@@ -25,7 +25,7 @@ Documentation is available at https://arbor.readthedocs.io/en/latest/
 
 Name:           arbor
 Version:        0.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Multi-compartment neural network simulation library
 
 License:        BSD
@@ -159,11 +159,6 @@ mkdir build-serial
 %endif
 
 %build
-# This packages triggers an ICE in GCC when using LTO on armv7.
-%ifarch armv7hl
-%define _lto_cflags %{nil}
-%endif
-
 # Best to use && so that if anything in the chain fails, the build also fails
 # straight away
 %global do_cmake_config %{expand: \
@@ -193,7 +188,9 @@ pushd build$MPI_COMPILE_TYPE  &&
 %endif
         -DARB_WITH_MPI:BOOL=$MPI_YES \\\
         -DARB_WITH_GPU:BOOL=OFF \\\
+%ifnarch armv7hl
         -DARB_ARCH:STRING="native" \\\
+%endif
         -DCMAKE_INSTALL_LIBDIR=%{_lib} \\\
         -DARB_WITH_PYTHON:BOOL=ON \\\
         -Darb_pyexecdir:STRING=$MPI_PYTHON3_SITEARCH \\\
@@ -386,6 +383,11 @@ popd
 %endif
 
 %changelog
+* Fri Aug 28 2020 Jeff Law <law@redhat.com> - 0.3-6
+- Re-enable LTO
+- Do not force -march=native on armv7hl so that build architecture does not bleed
+  into the binaries.  This should probably be done on all targets
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3-5
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild