diff --git a/srcpkgs/qt-plugin-mysql b/srcpkgs/qt-plugin-mysql
new file mode 120000
index 0000000000..382f738416
--- /dev/null
+++ b/srcpkgs/qt-plugin-mysql
@@ -0,0 +1 @@
+qt
\ No newline at end of file
diff --git a/srcpkgs/qt-plugin-pgsql b/srcpkgs/qt-plugin-pgsql
new file mode 120000
index 0000000000..382f738416
--- /dev/null
+++ b/srcpkgs/qt-plugin-pgsql
@@ -0,0 +1 @@
+qt
\ No newline at end of file
diff --git a/srcpkgs/qt/qt-devel.template b/srcpkgs/qt/qt-devel.template
index b8e356de96..208c57f5af 100644
--- a/srcpkgs/qt/qt-devel.template
+++ b/srcpkgs/qt/qt-devel.template
@@ -6,7 +6,7 @@ long_desc="${long_desc}
  This package contains the header development files and development
  programs used for runing Qt applications."
 
-revision=1
+revision=2
 
 Add_dependency run openssl-devel
 Add_dependency run dbus-devel
@@ -39,7 +39,6 @@ do_install()
 	done
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr || return 1
 	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib || return 1
-	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib || return 1
 	mv ${SRCPKGDESTDIR}/usr/lib/*.prl ${DESTDIR}/usr/lib || return 1
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib || return 1
 }
diff --git a/srcpkgs/qt/qt-plugin-mysql.template b/srcpkgs/qt/qt-plugin-mysql.template
new file mode 100644
index 0000000000..ed8602324c
--- /dev/null
+++ b/srcpkgs/qt/qt-plugin-mysql.template
@@ -0,0 +1,22 @@
+# Template file for 'qt-plugin-mysql'.
+#
+short_desc="Qt MySQL plugin"
+long_desc="${long_desc}
+
+ This package contains a Qt SQL plugin for MySQL."
+
+Add_dependency run glibc
+Add_dependency run libstdc++
+Add_dependency run libgcc
+Add_dependency run libmysqlclient
+Add_dependency run openssl
+Add_dependency run zlib
+Add_dependency run qt
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib/qt/plugins/sqldrivers
+
+	mv ${SRCPKGDESTDIR}/usr/lib/qt/plugins/sqldrivers/libqsqlmysql.so \
+		${DESTDIR}/usr/lib/qt/plugins/sqldrivers || return 1
+}
diff --git a/srcpkgs/qt/qt-plugin-pgsql.template b/srcpkgs/qt/qt-plugin-pgsql.template
new file mode 100644
index 0000000000..cd11d4956d
--- /dev/null
+++ b/srcpkgs/qt/qt-plugin-pgsql.template
@@ -0,0 +1,21 @@
+# Template file for 'qt-plugin-pgsql'.
+#
+short_desc="Qt PostgreSQL plugin"
+long_desc="${long_desc}
+
+ This package contains a Qt SQL plugin for PostgreSQL."
+
+Add_dependency run glibc
+Add_dependency run libstdc++
+Add_dependency run libgcc
+Add_dependency run postgresql-libs
+Add_dependency run openssl
+Add_dependency run qt
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib/qt/plugins/sqldrivers
+
+	mv ${SRCPKGDESTDIR}/usr/lib/qt/plugins/sqldrivers/libqsqlpsql.so \
+		${DESTDIR}/usr/lib/qt/plugins/sqldrivers || return 1
+}
diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template
index 3606cdc86d..f1df61f86f 100644
--- a/srcpkgs/qt/template
+++ b/srcpkgs/qt/template
@@ -1,7 +1,7 @@
 # Template file for 'qt'
 pkgname=qt
 version=4.6.2
-revision=1
+revision=2
 _distname=qt-everywhere-opensource-src
 wrksrc=${_distname}-${version}
 distfiles="ftp://ftp.qt.nokia.com/qt/source/${_distname}-$version.tar.gz"
@@ -15,8 +15,8 @@ configure_args="-confirm-license -opensource
 -system-libtiff -system-libpng -system-libmng -system-libjpeg
 -openssl-linked -optimized-qmake -no-rpath -reduce-relocations
 -no-separate-debug-info -gtkstyle -opengl -glib -no-sql-db2 -no-sql-ibase
--no-sql-mysql -no-sql-oci -no-sql-odbc -no-sql-sqlite2 -no-sql-tds
--no-cups -dbus-linked -no-nas-sound -iconv -shared -release -fast"
+-plugin-sql-mysql -plugin-sql-psql -no-sql-oci -no-sql-odbc -no-sql-sqlite2
+-no-cups -dbus-linked -no-nas-sound -iconv -shared -release -fast -no-sql-tds"
 make_install_target="INSTALL_ROOT=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="A cross-platform application and UI framework"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -25,10 +25,11 @@ long_desc="
  Qt(TM) is a GUI software toolkit. Qt simplifies the task of writing and
  maintaining GUI (graphical user interface) applications."
 
-subpackages="qt-plugin-gstreamer qt-demos qt-docs qt-qmake qt-qtconfig"
+subpackages="qt-plugin-gstreamer qt-plugin-pgsql qt-plugin-mysql"
+subpackages="${subpackages} qt-demos qt-docs qt-qmake qt-qtconfig"
 subpackages="${subpackages} qt-designer qt-devel qt-devel-tools"
 
-# XXX Missing dependencies: unixodbc, postgresql, mysql, cups.
+# XXX Missing dependencies: unixodbc and cups.
 Add_dependency run glibc
 Add_dependency run freetype
 Add_dependency run MesaLib
@@ -71,6 +72,15 @@ Add_dependency build jpeg-devel
 Add_dependency build libpng-devel
 Add_dependency build libSM-devel
 Add_dependency build libICE-devel
+Add_dependency build libmysqlclient-devel
+Add_dependency build postgresql-libs-devel
+Add_dependency build diffutils
+
+pre_configure()
+{
+	# Use cmp(1) from diffutils.
+	export PATH="/usr/bin:$PATH"
+}
 
 pre_build()
 {