diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index b3c34b17..60c94250 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Dec 18 14:46:41 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Enable build_hardened for all architectures
+- Switch back aarch64 to clang as '-fPIC' fixes bmo#1513605
+- Remove obolete '--enable-pie' as -pie is always enabled for 
+  gcc and clang
+
 -------------------------------------------------------------------
 Wed Dec 12 17:33:29 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index e4b118c1..936e175d 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -31,16 +31,13 @@
 %if 0%{?suse_version} > 1320
 %define clang_build 1
 %endif
-# Except on aarch64 due to bmo#1513605
-# and on %%arm due to large ld memory requirements
-%ifarch %arm aarch64
+# Except on %%arm due to large ld memory requirements
+%ifarch %arm
 %define clang_build 0
 %endif
 
-# PIE, full relro (x86_64 for now)
-%ifnarch %arm aarch64
+# PIE, full relro
 %define build_hardened 1
-%endif
 
 # Firefox only supports i686
 %ifarch %ix86
@@ -328,9 +325,7 @@ export CFLAGS="$CFLAGS -fno-delete-null-pointer-checks"
 export LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 %endif
 %if 0%{?build_hardened}
-%ifarch x86_64
-export LDFLAGS="${LDFLAGS} -Wl,-z,relro,-z,now"
-%endif
+export LDFLAGS="${LDFLAGS} -fPIC -Wl,-z,relro,-z,now"
 %endif
 %ifarch ppc64 ppc64le
 %if 0%{?clang_build} == 0
@@ -354,11 +349,6 @@ ac_add_options --enable-default-toolkit=cairo-gtk3
 %if 0%{?suse_version} >= 1550
 ac_add_options --disable-gconf
 %endif
-%if 0%{?build_hardened}
-%if 0%{?clang_build} == 0
-ac_add_options --enable-pie
-%endif
-%endif
 # gcc7 (boo#104105)
 %if 0%{?suse_version} > 1320
 ac_add_options --enable-optimize="-g -O2"