diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 6b3e784..1567305 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -55,7 +55,7 @@ BuildRequires: pkgconfig(libsystemd)
 Name:    qt5-qtbase
 Summary: Qt5 - QtBase components
 Version: 5.9.2
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -108,6 +108,7 @@ Patch64: qt5-qtbase-5.9.1-firebird.patch
 
 # fix for new mariadb
 Patch65: qtbase-opensource-src-5.9.0-mysql.patch
+Patch66: qtbase-mariadb.patch
 
 ## upstream patches (5.9 branch)
 
@@ -349,6 +350,7 @@ Qt5 libraries used for drawing widgets and OpenGL items.
 %if 0%{?fedora} > 27
 %patch65 -p1 -b .mysql
 %endif
+%patch66 -p1 -b .mariadb
 
 %if 0%{?inject_optflags}
 ## adjust $RPM_OPT_FLAGS
@@ -463,7 +465,10 @@ export MAKEFLAGS="%{?_smp_mflags}"
   %{?xkbcommon} \
   -system-zlib \
   %{?use_gold_linker} \
-  -no-directfb
+  -no-directfb \
+  QMAKE_CFLAGS_RELEASE="${CFLAGS:-$RPM_OPT_FLAGS}" \
+  QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-$RPM_OPT_FLAGS}" \
+  QMAKE_LFLAGS_RELEASE="${LDFLAGS:-$RPM_LD_FLAGS}"
 
 %if ! 0%{?inject_optflags}
 # ensure qmake build using optflags (which can happen if not munging qmake.conf defaults)
@@ -963,6 +968,12 @@ fi
 
 
 %changelog
+* Mon Oct 23 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.2-3
+- pass QMAKE_*_RELEASE to configure to ensure optflags get used (#1505260)
+
+* Thu Oct 19 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.2-2
+- refresh mariadb patch support (upstreamed version apparently incomplete)
+
 * Mon Oct 09 2017 Jan Grulich <jgrulich@redhat.com> - 5.9.2-1
 - 5.9.2
 
diff --git a/qtbase-mariadb.patch b/qtbase-mariadb.patch
new file mode 100644
index 0000000..84cf11d
--- /dev/null
+++ b/qtbase-mariadb.patch
@@ -0,0 +1,21 @@
+diff -up qtbase-opensource-src-5.9.2/src/plugins/sqldrivers/mysql/qsql_mysql.cpp.rex qtbase-opensource-src-5.9.2/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
+--- qtbase-opensource-src-5.9.2/src/plugins/sqldrivers/mysql/qsql_mysql.cpp.rex	2017-10-02 03:43:38.000000000 -0500
++++ qtbase-opensource-src-5.9.2/src/plugins/sqldrivers/mysql/qsql_mysql.cpp	2017-10-19 14:56:16.752878279 -0500
+@@ -1159,14 +1159,15 @@ static void qLibraryInit()
+ # endif // MYSQL_VERSION_ID
+ #endif // Q_NO_MYSQL_EMBEDDED
+ 
+-#ifdef MARIADB_BASE_VERSION
++#if defined(MARIADB_BASE_VERSION) || defined(MARIADB_VERSION_ID)
+     qAddPostRoutine(mysql_server_end);
+ #endif
+ }
+ 
+ static void qLibraryEnd()
+ {
+-#if !defined(MARIADB_BASE_VERSION)
++#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID)
++//#error should not get here on f27+ says rex
+ # if !defined(Q_NO_MYSQL_EMBEDDED)
+ #  if MYSQL_VERSION_ID > 40000
+ #   if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003