diff --git a/eclass/mozcoreconf-v4.eclass b/eclass/mozcoreconf-v4.eclass
index 07afd44..43a585b 100644
--- a/eclass/mozcoreconf-v4.eclass
+++ b/eclass/mozcoreconf-v4.eclass
@@ -212,6 +212,11 @@ mozconfig_init() {
 		;;
 	esac
 
+	# 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
+	fi
+
 	# Go a little faster; use less RAM
 	append-flags "$MAKEEDIT_FLAGS"