diff --git a/qt-x11-opensource-src-4.5.1-mysql_config-1.patch b/qt-x11-opensource-src-4.5.1-mysql_config-1.patch
deleted file mode 100644
index a9060d1..0000000
--- a/qt-x11-opensource-src-4.5.1-mysql_config-1.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up qt-x11-opensource-src-4.5.1/configure.rex qt-x11-opensource-src-4.5.1/configure
---- qt-x11-opensource-src-4.5.1/configure.rex	2009-04-21 18:57:35.000000000 -0500
-+++ qt-x11-opensource-src-4.5.1/configure	2009-05-03 17:46:30.236077416 -0500
-@@ -4334,8 +4334,8 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
- 		[ -z "$CFG_MYSQL_CONFIG" ] && CFG_MYSQL_CONFIG=`$WHICH mysql_config`
-                 if [ -x "$CFG_MYSQL_CONFIG" ]; then
-                     QT_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null`
--                    QT_LFLAGS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null`
--                    QT_LFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null`
-+                    QT_LFLAGS_MYSQL_R="-L`$CFG_MYSQL_CONFIG --plugindir 2>/dev/null`/.. -lmysqlclient_r"
-+                    QT_LFLAGS_MYSQL="-L`$CFG_MYSQL_CONFIG --plugindir 2>/dev/null`/.. -lmysqlclient"
- 		    QT_MYSQL_VERSION=`$CFG_MYSQL_CONFIG --version 2>/dev/null`
-                     QT_MYSQL_VERSION_MAJOR=`echo $QT_MYSQL_VERSION | cut -d . -f 1`
-                 fi
diff --git a/qt-x11-opensource-src-4.5.1-mysql_config.patch b/qt-x11-opensource-src-4.5.1-mysql_config.patch
new file mode 100644
index 0000000..2945958
--- /dev/null
+++ b/qt-x11-opensource-src-4.5.1-mysql_config.patch
@@ -0,0 +1,27 @@
+diff -up qt-x11-opensource-src-4.5.1/configure.mysql_config qt-x11-opensource-src-4.5.1/configure
+--- qt-x11-opensource-src-4.5.1/configure.mysql_config	2009-05-04 08:30:42.198097263 -0500
++++ qt-x11-opensource-src-4.5.1/configure	2009-05-04 08:31:22.977827199 -0500
+@@ -4334,6 +4334,7 @@ if [ "$CFG_ACCESSIBILITY" = "auto" ]; th
+     CFG_ACCESSIBILITY=yes
+ fi
+ 
++set -x
+ # auto-detect SQL-modules support
+ for _SQLDR in $CFG_SQL_AVAILABLE; do
+         case $_SQLDR in
+@@ -4342,8 +4343,15 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
+ 		[ -z "$CFG_MYSQL_CONFIG" ] && CFG_MYSQL_CONFIG=`$WHICH mysql_config`
+                 if [ -x "$CFG_MYSQL_CONFIG" ]; then
+                     QT_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null`
++                    $CFG_MYSQL_CONFIG --pkglibdir &>/dev/null && \
++                      QT_MYSQL_PKGLIBDIR=`$CFG_MYSQL_CONFIG --pkglibdir 2>/dev/null`
++                    if [ -n "$QT_MYSQL_PKGLIBDIR" ]; then
++                    QT_LFLAGS_MYSQL_R="-L`$CFG_MYSQL_CONFIG --pkglibdir 2>/dev/null` -lmysqlclient_r"
++                    QT_LFLAGS_MYSQL="-L`$CFG_MYSQL_CONFIG --pkglibdir 2>/dev/null` -lmysqlclient"
++                    else
+                     QT_LFLAGS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null`
+                     QT_LFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null`
++                    fi
+ 		    QT_MYSQL_VERSION=`$CFG_MYSQL_CONFIG --version 2>/dev/null`
+                     QT_MYSQL_VERSION_MAJOR=`echo $QT_MYSQL_VERSION | cut -d . -f 1`
+                 fi
diff --git a/qt.spec b/qt.spec
index 241cea9..4606262 100644
--- a/qt.spec
+++ b/qt.spec
@@ -55,7 +55,7 @@ Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
 # http://bugzilla.redhat.com/440673
 # well, not quite upstreamable yet, not but it's a first try...
 # until mysql_config can export a usable linker flags 
-Patch54: qt-x11-opensource-src-4.5.1-mysql_config-1.patch
+Patch54: qt-x11-opensource-src-4.5.1-mysql_config.patch
 
 ## qt-copy patches
 %define qt_copy 20090424