diff --git a/srcpkgs/qt-demos b/srcpkgs/qt-demos
deleted file mode 120000
index 382f738416a..00000000000
--- a/srcpkgs/qt-demos
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-docs b/srcpkgs/qt-docs
deleted file mode 120000
index 382f738416a..00000000000
--- a/srcpkgs/qt-docs
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-libphonon b/srcpkgs/qt-libphonon
deleted file mode 120000
index 382f738416a..00000000000
--- a/srcpkgs/qt-libphonon
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt-plugin-gstreamer b/srcpkgs/qt-plugin-gstreamer
deleted file mode 120000
index 382f738416a..00000000000
--- a/srcpkgs/qt-plugin-gstreamer
+++ /dev/null
@@ -1 +0,0 @@
-qt
\ No newline at end of file
diff --git a/srcpkgs/qt/qt-demos.rshlibs b/srcpkgs/qt/qt-demos.rshlibs
deleted file mode 100644
index d853a22b514..00000000000
--- a/srcpkgs/qt/qt-demos.rshlibs
+++ /dev/null
@@ -1,21 +0,0 @@
-libQtOpenGL.so.4
-libQtGui.so.4
-libQtCore.so.4
-libstdc++.so.6
-libm.so.6
-libgcc_s.so.1
-libc.so.6
-libGL.so.1
-libQtSql.so.4
-libQtNetwork.so.4
-libQtDeclarative.so.4
-libQtXml.so.4
-libQtSvg.so.4
-libQtMultimedia.so.4
-libQtScript.so.4
-libQtScriptTools.so.4
-libQtTest.so.4
-libQtHelp.so.4
-libQtDBus.so.4
-libQtXmlPatterns.so.4
-libphonon.so.4
diff --git a/srcpkgs/qt/qt-demos.template b/srcpkgs/qt/qt-demos.template
deleted file mode 100644
index edd5b7abbbd..00000000000
--- a/srcpkgs/qt/qt-demos.template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'qt-demos'.
-#
-depends="hicolor-icon-theme qt-docs>=$version"
-gtk_iconcache_dirs="/usr/share/icons/hicolor"
-short_desc="Qt examples and demos"
-long_desc="${long_desc}
-
- This package contains Qt 4 examples and demos."
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/share/doc/qt ${DESTDIR}/usr/bin
-	mkdir -p ${DESTDIR}/usr/share/icons/hicolor/64x64/apps
-	mv ${SRCPKGDESTDIR}/usr/bin/qtdemo ${DESTDIR}/usr/bin
-	mv ${SRCPKGDESTDIR}/usr/share/doc/qt/demos ${DESTDIR}/usr/share/doc/qt
-	mv ${SRCPKGDESTDIR}/usr/share/doc/qt/examples \
-		${DESTDIR}/usr/share/doc/qt
-	mv ${SRCPKGDESTDIR}/usr/share/icons/hicolor/64x64/apps/qtlogo.png \
-		${DESTDIR}/usr/share/icons/hicolor/64x64/apps
-	
-}
diff --git a/srcpkgs/qt/qt-designer.rshlibs b/srcpkgs/qt/qt-designer.rshlibs
index 87e1a2a915e..e1c32c98313 100644
--- a/srcpkgs/qt/qt-designer.rshlibs
+++ b/srcpkgs/qt/qt-designer.rshlibs
@@ -5,10 +5,7 @@ libstdc++.so.6
 libgcc_s.so.1
 libc.so.6
 libQtDeclarative.so.4
-libQtOpenGL.so.4
-libGL.so.1
 libm.so.6
 libQtScript.so.4
 libQtXml.so.4
 libQtNetwork.so.4
-libphonon.so.4
diff --git a/srcpkgs/qt/qt-docs.template b/srcpkgs/qt/qt-docs.template
deleted file mode 100644
index 348def49b41..00000000000
--- a/srcpkgs/qt/qt-docs.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'qt-docs'.
-#
-depends="qt>=$version"
-noarch=yes
-short_desc="Qt API documentation"
-long_desc="${long_desc}
-
- This package contains the complete Qt 4 API documentation (new help format)."
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/share/doc
-	mv ${SRCPKGDESTDIR}/usr/share/doc/qt ${DESTDIR}/usr/share/doc
-}
diff --git a/srcpkgs/qt/qt-libphonon.rshlibs b/srcpkgs/qt/qt-libphonon.rshlibs
deleted file mode 100644
index 21dbb103f2f..00000000000
--- a/srcpkgs/qt/qt-libphonon.rshlibs
+++ /dev/null
@@ -1,9 +0,0 @@
-libpulse-mainloop-glib.so.0
-libpulse.so.0
-libQtDBus.so.4
-libQtGui.so.4
-libQtCore.so.4
-libstdc++.so.6
-libm.so.6
-libgcc_s.so.1
-libc.so.6
diff --git a/srcpkgs/qt/qt-libphonon.template b/srcpkgs/qt/qt-libphonon.template
deleted file mode 100644
index 2df8c44816a..00000000000
--- a/srcpkgs/qt/qt-libphonon.template
+++ /dev/null
@@ -1,10 +0,0 @@
-# Template file for 'libphonon'.
-#
-short_desc="Qt libphonon runtime libraries"
-long_desc="${long_desc}
-
- This package contains the Qt phonon runtime libraries."
-
-do_install() {
-	vmove "usr/lib/libphonon*.so*" usr/lib
-}
diff --git a/srcpkgs/qt/qt-plugin-gstreamer.rshlibs b/srcpkgs/qt/qt-plugin-gstreamer.rshlibs
deleted file mode 100644
index b8859af7a87..00000000000
--- a/srcpkgs/qt/qt-plugin-gstreamer.rshlibs
+++ /dev/null
@@ -1,15 +0,0 @@
-libgstreamer-0.10.so.0
-libgobject-2.0.so.0
-libgstinterfaces-0.10.so.0
-libgstvideo-0.10.so.0
-libgstbase-0.10.so.0
-libgstaudio-0.10.so.0
-libphonon.so.4
-libglib-2.0.so.0
-libQtOpenGL.so.4
-libQtGui.so.4
-libQtCore.so.4
-libGL.so.1
-libstdc++.so.6
-libgcc_s.so.1
-libc.so.6
diff --git a/srcpkgs/qt/qt-plugin-gstreamer.template b/srcpkgs/qt/qt-plugin-gstreamer.template
deleted file mode 100644
index 4d1aea39f3d..00000000000
--- a/srcpkgs/qt/qt-plugin-gstreamer.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'qt-plugin-gstreamer'.
-#
-short_desc="Qt GStreamer phonon backend plugin"
-long_desc="${long_desc}
-
- This package contains a Qt phonon backend plugin for GStreamer."
-
-do_install() {
-	vmove usr/lib/qt/plugins/phonon_backend/libphonon_gstreamer.so \
-		usr/lib/qt/plugins/phonon_backend
-}
diff --git a/srcpkgs/qt/qt-qtconfig.rshlibs b/srcpkgs/qt/qt-qtconfig.rshlibs
index 9a746efc5a5..66007ced411 100644
--- a/srcpkgs/qt/qt-qtconfig.rshlibs
+++ b/srcpkgs/qt/qt-qtconfig.rshlibs
@@ -3,7 +3,3 @@ libQtCore.so.4
 libstdc++.so.6
 libgcc_s.so.1
 libc.so.6
-libgstreamer-0.10.so.0
-libgobject-2.0.so.0
-libphonon.so.4
-libglib-2.0.so.0
diff --git a/srcpkgs/qt/qt.rshlibs b/srcpkgs/qt/qt.rshlibs
index 3f3994ff9c2..cdd504d56fd 100644
--- a/srcpkgs/qt/qt.rshlibs
+++ b/srcpkgs/qt/qt.rshlibs
@@ -19,7 +19,6 @@ libfontconfig.so.1
 libXext.so.6
 libX11.so.6
 libGL.so.1
-libOpenVG.so.1
 libasound.so.2
 libmng.so.1
 libjpeg.so.8
diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template
index 290bcf47384..36c94e36b92 100644
--- a/srcpkgs/qt/template
+++ b/srcpkgs/qt/template
@@ -1,20 +1,19 @@
 # Template file for 'qt'
 pkgname=qt
 version=4.8.2
-revision=4
+revision=5
 patch_args="-Np1"
 _distname=qt-everywhere-opensource-src
 wrksrc=${_distname}-${version}
 homepage="http://qt.nokia.com/"
-subpackages="qt-libphonon qt-plugin-pgsql qt-plugin-mysql qt-plugin-sqlite
-qt-demos qt-docs qt-qmake qt-qtconfig qt-designer qt-devel qt-devel-tools qt-plugin-gstreamer"
+subpackages="qt-plugin-pgsql qt-plugin-mysql qt-plugin-sqlite
+qt-qmake qt-qtconfig qt-designer qt-devel qt-devel-tools"
 # XXX Missing dependencies: unixodbc.
 makedepends="pkg-config libpng-devel>=1.5.10 MesaLib-devel libXrender-devel
 fontconfig-devel libXi-devel libXv-devel libXinerama-devel libXrandr-devel
-libXcursor-devel dbus-devel glib-devel gstreamer-devel gst-plugins-base-devel
+libXcursor-devel dbus-devel glib-devel icu-devel cups-devel
 sqlite-devel alsa-lib-devel openssl-devel tiff-devel libmng-devel jpeg-devel
-libmysqlclient-devel>=5.5.27 postgresql-libs-devel pulseaudio-devel gtk+-devel
-icu-devel cups-devel"
+libmysqlclient-devel>=5.5.27 postgresql-libs-devel pulseaudio-devel gtk+-devel"
 short_desc="A cross-platform application and UI framework"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3, LGPL-2.1"
@@ -30,25 +29,15 @@ do_configure() {
 	sed -i "s|-O2|${XBPS_CXXFLAGS}|" mkspecs/common/g++.conf
 	sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${XBPS_LDFLAGS}|g" mkspecs/common/g++.conf
 
-	./configure -v -confirm-license -opensource \
+	./configure -confirm-license -opensource \
 		-prefix /usr -sysconfdir /etc -plugindir /usr/lib/qt/plugins \
 		-importdir /usr/lib/qt/imports \
 		-translationdir /usr/share/qt/translations \
 		-datadir /usr/share/qt \
-		-docdir /usr/share/doc/qt \
-		-examplesdir /usr/share/doc/qt/examples \
-		-demosdir /usr/share/doc/qt/demos -largefile \
-		-plugin-sql-sqlite -system-sqlite \
-		-xmlpatterns -svg -no-webkit \
-		-scripttools -system-zlib -graphicssystem raster \
-		-system-libtiff -system-libpng -system-libmng -system-libjpeg \
-		-openssl-linked -optimized-qmake -no-rpath -reduce-relocations \
-		-no-separate-debug-info -gtkstyle -opengl -glib -gstreamer \
-		-no-sql-db2 -no-sql-ibase -gtkstyle \
-		-plugin-sql-mysql -plugin-sql-psql -no-sql-oci \
-		-no-sql-odbc -no-sql-sqlite2 \
-		-dbus-linked -no-nas-sound -iconv -shared \
-		-release -fast -no-sql-tds
+		-nomake demos -nomake examples -nomake docs -gtkstyle \
+		-system-sqlite -no-phonon -no-phonon-backend -no-webkit \
+		-graphicssystem raster -openssl-linked -silent -no-rpath \
+		-optimized-qmake -reduce-relocations -dbus-linked -no-openvg
 }
 
 do_build() {