diff --git a/x11/qt4/Makefile b/x11/qt4/Makefile
index 38cc4ce0f90..11453e987d6 100644
--- a/x11/qt4/Makefile
+++ b/x11/qt4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2006/10/08 21:43:50 espie Exp $
+# $OpenBSD: Makefile,v 1.22 2006/10/30 18:17:32 espie Exp $
 
 COMMENT=		"C++ X11 GUI toolkit"
 COMMENT-examples=	"examples for qt4"
@@ -20,7 +20,7 @@ SHARED_LIBS=	Qt3Support 6.0 \
 		QtCore 6.0 \
 		QtDesigner 6.0 \
 		QtDesignerComponents 6.0 \
-		QtGui 6.0 \
+		QtGui 6.1 \
 		QtNetwork 6.0 \
 		QtOpenGL 6.0 \
 		QtSql 6.0 \
@@ -31,8 +31,8 @@ SHARED_LIBS=	Qt3Support 6.0 \
 		QtDBus 0.0 
 
 
-VERSION=	4.2.0
-DISTNAME=	qt-x11-opensource-src-4.2.0
+VERSION=	4.2.1
+DISTNAME=	qt-x11-opensource-src-4.2.1
 
 
 CATEGORIES=	x11
@@ -46,7 +46,8 @@ MASTER_SITES=	ftp://ftp.rediris.es/mirror/Qt/source/ \
 HOMEPAGE=	http://www.trolltech.com/qt/
 
 MAINTAINER=	Marc Espie <espie@openbsd.org>
-
+ 
+PSEUDO_FLAVORS=	no_examples
 FLAVOR?=
 
 # GPL/QPL
@@ -100,7 +101,18 @@ LIB_DEPENDS=
 WANTLIB=
 BUILD_DEPENDS+=::print/cups
 
-MULTI_PACKAGES+=-html -examples
+MULTI_PACKAGES+=-html 
+
+
+.if ${FLAVOR:L:Mno_examples}
+ALL_TARGET=sub-src-all-ordered sub-tools-all-ordered
+INSTALL_TARGET=sub-src-install_subtargets-ordered \
+	sub-tools-install_subtargets-ordered install_htmldocs \
+	install_translations install_qmake install_mkspecs
+.else
+MULTI_PACKAGES+=-examples
+PROGRAMS+=	qtdemo
+.endif
 
 .if !defined(PACKAGING) || ${SUBPACKAGE} == ""
 LIB_DEPENDS+=	jpeg::graphics/jpeg \
@@ -191,7 +203,7 @@ NO_REGRESS=	Yes
 
 PROGRAMS4=assistant designer findtr linguist lrelease lupdate moc qm2ts qmake \
 	qtconfig uic uic3
-PROGRAMS= rcc qtdemo qt3to4 syncqt
+PROGRAMS+= rcc qt3to4 syncqt
 
 
 QMAKE=${WRKBUILD}/bin/qmake
@@ -204,20 +216,6 @@ MAKE_FLAGS+=LIB$l_VERSION=$v
 
 FAKE_FLAGS=$(MAKE_FLAGS) INSTALL_ROOT=${WRKINST}
 
-DIRECTORIES= src/corelib src/gui src/network src/opengl src/qt3support src/sql src/xml \
-	src/plugins/accessible/compat \
-	src/plugins/accessible/widgets \
-	src/plugins/codecs/cn \
-	src/plugins/codecs/jp \
-	src/plugins/codecs/kr \
-	src/plugins/codecs/tw \
-	src/plugins/imageformats/jpeg \
-	src/plugins/sqldrivers/mysql \
-	src/plugins/sqldrivers/psql \
-	tools/designer/src/components/lib \
-	tools/designer/src/lib \
-	tools/designer/src/plugins/widgets
-
 post-install:
 	# extra doc
 	cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${QT_DOC}
diff --git a/x11/qt4/distinfo b/x11/qt4/distinfo
index 5cee7d98883..805321fb2d1 100644
--- a/x11/qt4/distinfo
+++ b/x11/qt4/distinfo
@@ -1,4 +1,4 @@
-MD5 (qt-x11-opensource-src-4.2.0.tar.gz) = 2c062a125d5ca66397e3430ba537fbec
-RMD160 (qt-x11-opensource-src-4.2.0.tar.gz) = d9825a32fcfd495bf61316b4ee346a78ef5cc4f8
-SHA1 (qt-x11-opensource-src-4.2.0.tar.gz) = b878d21cd6844261feb97a0a7a813160bf475596
-SIZE (qt-x11-opensource-src-4.2.0.tar.gz) = 37084418
+MD5 (qt-x11-opensource-src-4.2.1.tar.gz) = 2ab1c88084f55b94809f025a8503bf18
+RMD160 (qt-x11-opensource-src-4.2.1.tar.gz) = af9935cb6a3ef3aa738e81389f13c09e837a2a01
+SHA1 (qt-x11-opensource-src-4.2.1.tar.gz) = ef4d109608ea32d318b009c89f298da3d362e3fb
+SIZE (qt-x11-opensource-src-4.2.1.tar.gz) = 37069122
diff --git a/x11/qt4/pkg/PFRAG.shared b/x11/qt4/pkg/PFRAG.shared
index f1d2c771b5a..b23ec515157 100644
--- a/x11/qt4/pkg/PFRAG.shared
+++ b/x11/qt4/pkg/PFRAG.shared
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.8 2006/10/08 21:43:50 espie Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.9 2006/10/30 18:17:32 espie Exp $
 @lib lib/libQt3Support.so.${LIBQt3Support_VERSION}
 @lib lib/libQtAssistantClient.so.${LIBQtAssistantClient_VERSION}
 @lib lib/libQtCore.so.${LIBQtCore_VERSION}
@@ -31,12 +31,7 @@ lib/qt4/plugins/codecs/libqcncodecs.so
 lib/qt4/plugins/codecs/libqjpcodecs.so
 lib/qt4/plugins/codecs/libqkrcodecs.so
 lib/qt4/plugins/codecs/libqtwcodecs.so
-lib/qt4/plugins/designer/libarthurplugin.so
-lib/qt4/plugins/designer/libcontainerextension.so
-lib/qt4/plugins/designer/libcustomwidgetplugin.so
 lib/qt4/plugins/designer/libqt3supportwidgets.so
-lib/qt4/plugins/designer/libtaskmenuextension.so
-lib/qt4/plugins/designer/libworldtimeclockplugin.so
 lib/qt4/plugins/iconengines/libqsvg.so
 lib/qt4/plugins/imageformats/libqgif.so
 lib/qt4/plugins/imageformats/libqjpeg.so
diff --git a/x11/qt4/pkg/PFRAG.shared-examples b/x11/qt4/pkg/PFRAG.shared-examples
index 963ae89a337..551743cbbe2 100644
--- a/x11/qt4/pkg/PFRAG.shared-examples
+++ b/x11/qt4/pkg/PFRAG.shared-examples
@@ -1,2 +1,7 @@
-@comment $OpenBSD: PFRAG.shared-examples,v 1.2 2006/10/08 21:43:50 espie Exp $
+@comment $OpenBSD: PFRAG.shared-examples,v 1.3 2006/10/30 18:17:32 espie Exp $
 lib/qt4/examples/tools/plugandpaint/plugins/libpnp_extrafilters.so
+lib/qt4/plugins/designer/libarthurplugin.so
+lib/qt4/plugins/designer/libcontainerextension.so
+lib/qt4/plugins/designer/libcustomwidgetplugin.so
+lib/qt4/plugins/designer/libtaskmenuextension.so
+lib/qt4/plugins/designer/libworldtimeclockplugin.so
diff --git a/x11/qt4/pkg/PLIST-examples b/x11/qt4/pkg/PLIST-examples
index 0fd00a6b142..9c8b8e68e12 100644
--- a/x11/qt4/pkg/PLIST-examples
+++ b/x11/qt4/pkg/PLIST-examples
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST-examples,v 1.7 2006/10/08 21:43:50 espie Exp $
+@comment $OpenBSD: PLIST-examples,v 1.8 2006/10/30 18:17:32 espie Exp $
+@conflict qt4-<4.2.1
 %%SHARED%%
 bin/qtdemo
 lib/qt4/bin/qtdemo