diff --git a/package/x11/qt/qt.conf b/package/x11/qt/qt.conf
index bc4e7048d..4a6765508 100644
--- a/package/x11/qt/qt.conf
+++ b/package/x11/qt/qt.conf
@@ -32,9 +32,17 @@ qt_pass() {
 	export QTDIR LD_LIBRARY_PATH PATH
 
 	# Qt only supports some selected options ...
-	confopt="-prefix $root/$prefix $1 -thread -qt-gif -system-zlib \
-	         -system-libmng -system-libpng -system-libjpeg -xft -xrender \
-	         -no-g++-exceptions -no-stl"
+	confopt="$1 -prefix $root/$prefix -bindir $bindir -libdir $libdir \
+		 -docdir $docdir -sysconfdir $sysconfdir \
+		 -thread -qt-gif -xft -xrender -no-g++-exceptions -no-stl"
+
+	pkginstalled zlib && var_append confopt " " "-system-zlib"
+
+	pkginstalled libpng && var_append confopt " " "-system-libpng"
+	pkginstalled libmng && var_append confopt " " "-system-libmng"
+	pkginstalled libjpeg && var_append confopt " " "-system-libjpeg"
+
+	pkginstalled nas && var_append confopt " " "-system-nas-sound"
 
 	pkginstalled mysql && var_append confopt " " "-plugin-sql-mysql \
 		-I$pkg_mysql_prefix/include/mysql -L$pkg_mysql_prefix/lib"
@@ -58,10 +66,10 @@ qt_pass() {
 	
         echo "Copy some documentation ..."
 	# to be done in another package: examples extensions tutorial tools ...
-	cp -r ch* doc/html tutorial $docdir/
+	cp -a ch* tutorial $docdir/
 	
 	find $docdir -name '*.o' | xargs rm -vf
-	find $docdir -type f -perm +111 | xargs strip -v || true
+	find $docdir -type f -perm +111 -exec strip -v '{}' \;
 	
 	cat > $root/etc/profile.d/qt33 <<-EOT
 QT33DIR=/$prefix
@@ -81,4 +89,3 @@ qt_main() {
 
 createdocs=0
 custmain=qt_main
-