diff --git a/mozcoreconf-v5.eclass b/mozcoreconf-v6.eclass
index ab8440b..b611d1c 100644
--- a/mozcoreconf-v5.eclass
+++ b/mozcoreconf-v6.eclass
@@ -161,7 +161,9 @@ mozconfig_init() {
 	elif [[ ${ARCH} == hppa ]]; then
 		mozconfig_annotate "more than -O0 causes a segfault on hppa" --enable-optimize=-O0
 	elif [[ ${ARCH} == x86 ]]; then
-		mozconfig_annotate "less then -O2 causes a segfault on x86" --enable-optimize=-O2
+		mozconfig_annotate "less than -O2 causes a segfault on x86" --enable-optimize=-O2
+	elif [[ ${ARCH} == arm ]] && [[ $(gcc-major-version) -ge 6 ]]; then
+		mozconfig_annotate "less than -O2 causes a breakage on arm with gcc-6" --enable-optimize=-O2
 	elif use custom-optimization || [[ ${ARCH} =~ (alpha|ia64) ]]; then
 		# Set optimization level based on CFLAGS
 		if is-flag -O0; then
@@ -215,7 +217,7 @@ mozconfig_init() {
 
 	# We need to append flags for gcc-6 support
 	if [[ $(gcc-major-version) -ge 6 ]]; then
-		append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2
+		append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns -fno-schedule-insns2
 	fi
 
 	# Use the MOZILLA_FIVE_HOME for the rpath