diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes
index 905f62a..ebe516d 100644
--- a/libqt5-qtwebengine.changes
+++ b/libqt5-qtwebengine.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov  3 10:47:39 UTC 2016 - wbauer@tmo.at
+
+- Add -fno-delete-null-pointer-checks to CXXFLAGS instead to
+  really fix the gcc6 issues (boo#1003985)
+
 -------------------------------------------------------------------
 Tue Oct 25 13:40:49 UTC 2016 - alarrosa@suse.com
 
diff --git a/libqt5-qtwebengine.spec b/libqt5-qtwebengine.spec
index f53f915..5d33ddc 100644
--- a/libqt5-qtwebengine.spec
+++ b/libqt5-qtwebengine.spec
@@ -236,8 +236,9 @@ pushd src/3rdparty/chromium/
 build/linux/unbundle/replace_gyp_files.py $myconf
 popd
 
-RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-delete-null-pointer-checks"
+export CXXFLAGS+=" -fno-delete-null-pointer-checks"
 %ifnarch x86_64
+RPM_OPT_FLAGS="$RPM_OPT_FLAGS "
 export RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-g / }
 %endif
 %qmake5 QMAKE_CFLAGS="$RPM_OPT_FLAGS" \