diff --git a/x11/qt2/Makefile b/x11/qt2/Makefile
index 64866577354..8caf44a30ff 100644
--- a/x11/qt2/Makefile
+++ b/x11/qt2/Makefile
@@ -1,15 +1,18 @@
-# $OpenBSD: Makefile,v 1.55 2006/10/02 23:18:26 naddy Exp $
+# $OpenBSD: Makefile,v 1.56 2006/11/20 12:02:29 espie Exp $
 # $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $
-COMMENT=		"C++ X11 GUI toolkit"
+
+COMMENT-main=		"C++ X11 GUI toolkit"
 COMMENT-examples=	"examples and tutorial for qt2"
 COMMENT-html=		"off-line html documentation for qt2"
 
 VERSION=	3.2
 DISTNAME=	qt-2.${VERSION}
 CATEGORIES=	x11
-PKGNAME=		qt2-${VERSION}p2
+
+PKGNAME-main=		qt2-${VERSION}p3
 PKGNAME-examples=	qt2-examples-${VERSION}p0
 PKGNAME-html=		qt2-html-${VERSION}p0
+
 SHARED_LIBS=		qt	20.0
 
 
@@ -25,7 +28,6 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-myWANTLIB=		GL GLU X11 Xext Xmu c m stdc++ z
 
 #CXXFLAGS+=	-g
 
@@ -46,8 +48,7 @@ CONFIGURE_ARGS=	-gif -system-libmng -system-libpng -system-jpeg \
 
 CONFIGURE_ENV=	QTDIR="${WRKSRC}" MODULES="${QTMODULES}"
 
-MULTI_PACKAGES=	-examples -html
-SUBPACKAGE?=
+MULTI_PACKAGES=-main -examples -html
 
 QTMODULES=	tools kernel widgets dialogs \
 		iconview workspace network canvas table xml
@@ -56,27 +57,19 @@ EXTRA_SAMPLES=
 QTMODULES+= opengl
 EXTRA_SAMPLES+=box gear glpixmap overlay overlay_x11 sharedbox
 
-.if ${SUBPACKAGE} != "-examples"
-myWANTLIB+=	lcms ICE Xft SM jpeg 
-.endif
-.if !defined(PACKAGING) || ${SUBPACKAGE} == "-examples"
-myWANTLIB+=	pthread
-.endif
 
-LIB_DEPENDS=
+myWANTLIB=		GL GLU X11 Xext Xmu c m stdc++ z
+
+WANTLIB-examples=	${myWANTLIB} pthread
+WANTLIB-main=		${myWANTLIB} lcms ICE Xft SM jpeg
+
+LIB_DEPENDS-main= 	png::graphics/png \
+			mng::graphics/libmng
+
+LIB_DEPENDS-examples= 	lib/qt2/qt.>=2.::x11/qt2
+
+PKG_ARCH-html=		*
 
-.if !defined(PACKAGING) || ${SUBPACKAGE} != "-html"
-LIB_DEPENDS+=	png::graphics/png \
-		mng::graphics/libmng
-WANTLIB=	${myWANTLIB}
-.endif
-.if defined(PACKAGING)
-.  if ${SUBPACKAGE} == "-examples"
-LIB_DEPENDS=	lib/qt2/qt.>=2.::x11/qt2
-.  elif ${SUBPACKAGE} == "-html"
-PKG_ARCH=	*
-.  endif
-.endif
 
 QT_INCDIR=	${PREFIX}/include/X11/qt2
 TRUEDIR=	${TRUEPREFIX}/lib/qt2
diff --git a/x11/qt2/pkg/DESCR b/x11/qt2/pkg/DESCR-main
similarity index 100%
rename from x11/qt2/pkg/DESCR
rename to x11/qt2/pkg/DESCR-main
diff --git a/x11/qt2/pkg/MESSAGE b/x11/qt2/pkg/MESSAGE-main
similarity index 100%
rename from x11/qt2/pkg/MESSAGE
rename to x11/qt2/pkg/MESSAGE-main
diff --git a/x11/qt2/pkg/PFRAG.no-shared b/x11/qt2/pkg/PFRAG.no-shared
deleted file mode 100644
index a182729c2df..00000000000
--- a/x11/qt2/pkg/PFRAG.no-shared
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.no-shared,v 1.4 2001/03/21 23:56:51 espie Exp $
-lib/qt2/libqt.a
diff --git a/x11/qt2/pkg/PFRAG.no-shared-main b/x11/qt2/pkg/PFRAG.no-shared-main
new file mode 100644
index 00000000000..b8f530a47de
--- /dev/null
+++ b/x11/qt2/pkg/PFRAG.no-shared-main
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.no-shared-main,v 1.1 2006/11/20 12:02:29 espie Exp $
+lib/qt2/libqt.a
diff --git a/x11/qt2/pkg/PFRAG.shared b/x11/qt2/pkg/PFRAG.shared
deleted file mode 100644
index 5d55657a2d6..00000000000
--- a/x11/qt2/pkg/PFRAG.shared
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.16 2005/12/29 13:43:40 espie Exp $
-@lib lib/libqt.so.${LIBqt_VERSION}
-@lib lib/qt2/libqt.so.${LIBqt_VERSION}
diff --git a/x11/qt2/pkg/PFRAG.shared-main b/x11/qt2/pkg/PFRAG.shared-main
new file mode 100644
index 00000000000..32d2ccbbf8e
--- /dev/null
+++ b/x11/qt2/pkg/PFRAG.shared-main
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.shared-main,v 1.1 2006/11/20 12:02:29 espie Exp $
+@lib lib/libqt.so.${LIBqt_VERSION}
+@lib lib/qt2/libqt.so.${LIBqt_VERSION}
diff --git a/x11/qt2/pkg/PLIST b/x11/qt2/pkg/PLIST-main
similarity index 99%
rename from x11/qt2/pkg/PLIST
rename to x11/qt2/pkg/PLIST-main
index bb9ca5e5363..d888d9e1499 100644
--- a/x11/qt2/pkg/PLIST
+++ b/x11/qt2/pkg/PLIST-main
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.18 2005/03/06 14:17:45 espie Exp $
+@comment $OpenBSD: PLIST-main,v 1.1 2006/11/20 12:02:29 espie Exp $
+@pkgpath x11/qt2
 bin/findtr
 bin/moc2
 bin/qt20fix
diff --git a/x11/qt2/qt2.port.mk b/x11/qt2/qt2.port.mk
index d3bf82f338f..c33276fe973 100644
--- a/x11/qt2/qt2.port.mk
+++ b/x11/qt2/qt2.port.mk
@@ -1,8 +1,10 @@
-# $OpenBSD: qt2.port.mk,v 1.2 2006/08/01 22:55:53 espie Exp $
+# $OpenBSD: qt2.port.mk,v 1.3 2006/11/20 12:02:29 espie Exp $
 
 # This fragment uses MODQT_* variables to make it easier to substitute
 # qt1/qt2/qt3 in a port.
-LIB_DEPENDS+=lib/qt2/qt.>=2::x11/qt2
+
+MODQT_LIB_DEPENDS=lib/qt2/qt.>=2::x11/qt2
+LIB_DEPENDS+=	${MODQT_LIB_DEPENDS}
 
 MODQT_LIBDIR=	${LOCALBASE}/lib/qt2
 MODQT_INCDIR=	${LOCALBASE}/include/X11/qt2