diff --git a/macros.qt5 b/macros.qt5
index b8fb250..ff37ef0 100644
--- a/macros.qt5
+++ b/macros.qt5
@@ -18,13 +18,16 @@
 %_qt5_sysconfdir %{_qt5_settingsdir}
 %_qt5_translationdir %{_datadir}/qt5/translations
 
-%qmake_qt5 \
-  %{_qt5_qmake} \\\
-  QMAKE_CFLAGS_DEBUG="${CFLAGS:-%optflags}" \\\
-  QMAKE_CFLAGS_RELEASE="${CFLAGS:-%optflags}" \\\
-  QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS:-%optflags}" \\\
-  QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-%optflags}" \\\
-  QMAKE_LFLAGS_DEBUG="${LDFLAGS:-%{?__global_ldflags}}" \\\
-  QMAKE_LFLAGS_RELEASE="${LDFLAGS:-%{?__global_ldflags}}" \\\
+%_qt5_ldflags %{?__global_ldflags} @@QT5_RPM_LD_FLAGS@
+%_qt5_optflags %{optflags} @@QT5_RPM_OPT_FLAGS@@
+
+%_qt5_qmake_flags \\\
+  QMAKE_CFLAGS_DEBUG="${CFLAGS:-%{_qt5_optflags}}" \\\
+  QMAKE_CFLAGS_RELEASE="${CFLAGS:-%{_qt5_optflags}}" \\\
+  QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS:-%{_qt5_optflags}}" \\\
+  QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-%{_qt5_optflags}}" \\\
+  QMAKE_LFLAGS_DEBUG="${LDFLAGS:-%{_qt5_ldflags}}" \\\
+  QMAKE_LFLAGS_RELEASE="${LDFLAGS:-%{_qt5_ldflags}}" \\\
   QMAKE_STRIP=
 
+%qmake_qt5 %{_qt5_qmake} %{?_qt5_qmake_flags}
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index f39771a..4dfe7e7 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -39,7 +39,7 @@
 Summary: Qt5 - QtBase components
 Name:    qt5-qtbase
 Version: 5.6.0
-Release: 0.20.%{prerelease}%{?dist}
+Release: 0.21.%{prerelease}%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -330,8 +330,14 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
 %patch150 -p1 -b .moc_system_defines
 %patch184 -p1 -b .0084
 
-# drop -fexceptions from $RPM_OPT_FLAGS
+## adjust $RPM_OPT_FLAGS
+# remove -fexceptions
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
+# add -fno-delete-null-pointer-checks for f24/gcc6
+%if 0%{?fedora} > 23
+QT5_RPM_OPT_FLAGS="-fno-delete-null-pointer-checks"
+RPM_OPT_FLAGS="$RPM_OPT_FLAGS $QT5_RPM_OPT_FLAGS"
+%endif
 
 %define platform linux-g++
 
@@ -468,6 +474,8 @@ sed -i \
   -e "s|@@EPOCH@@|%{?epoch}%{!?epoch:0}|g" \
   -e "s|@@VERSION@@|%{version}|g" \
   -e "s|@@EVR@@|%{?epoch:%{epoch:}}%{version}-%{release}|g" \
+  -e "s|@@QT5_RPM_LD_FLAGS@@|$QT5_RPM_LD_FLAGS|g" \
+  -e "s|@@QT5_RPM_OPT_FLAGS@@|$QT5_RPM_OPT_FLAGS|g" \
   %{buildroot}%{rpm_macros_dir}/macros.qt5
 
 # create/own dirs
@@ -869,6 +877,9 @@ fi
 
 
 %changelog
+* Tue Feb 02 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.21.beta
+- build with and add to macros.qt5 flags: -fno-delete-null-pointer-checks
+
 * Fri Jan 15 2016 Than Ngo <than@redhat.com> - 5.6.0-0.20.beta
 - enable -qt-xcb to fix non-US keys under VNC (#1295713)