diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index eae0aaca603..1b76ae37c72 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.6.0
-revision=8
+revision=9
 wrksrc="qt-everywhere-opensource-src-${version}"
 homepage="http://qt.io/"
 short_desc="A cross-platform application and UI framework (QT5)"
@@ -33,20 +33,21 @@ CXXFLAGS="-DOPENSSL_NO_SSL3_METHOD"
 
 _move_examples() {
 	if [ -d ${PKGDESTDIR}/usr/share/qt5/examples ]; then
-		# The help files (*.qch) are in qt5-doc
-		find ${PKGDESTDIR}/usr/share/qt5/examples -iname "*.qch" -delete
 		# Copy examples to /destdir/qt5-examples-${version} subpackage
 		mkdir -p /destdir/qt5-examples-${version}/usr/share/qt5
 		cp -pR ${PKGDESTDIR}/usr/share/qt5/examples \
 			/destdir/qt5-examples-${version}/usr/share/qt5
 		rm -rf ${PKGDESTDIR}/usr/share/qt5/examples
+		# The help files (*.qch) are in qt5-doc
+		find /destdir/qt5-examples-${version}/usr/share/qt5/examples -iname "*.qch" -delete
 	fi
 }
 
 _install_subpkg() {
-	local module=$1 base
+	local module=$1 f base
 	cd ${wrksrc}/${module}
 	make INSTALL_ROOT=${PKGDESTDIR} install
+	rm -rf ${PKGDESTDIR}/builddir
 	rm -rf ${PKGDESTDIR}/usr/include
 	rm -rf ${PKGDESTDIR}/usr/lib/cmake
 	rm -rf ${PKGDESTDIR}/usr/lib/qt5/mkspecs
@@ -67,6 +68,7 @@ _install_devel() {
 	local module=$1
 	cd ${wrksrc}/${module}
 	make INSTALL_ROOT=${PKGDESTDIR} install
+	rm -rf ${PKGDESTDIR}/builddir
 	rm -rf ${PKGDESTDIR}/usr/share
 	rm -rf ${PKGDESTDIR}/usr/lib/qt5/bin
 	rm -rf ${PKGDESTDIR}/usr/lib/qt5/qml