diff --git a/x11/qt/Makefile b/x11/qt/Makefile
index 203be6b9465..c39fa6636fc 100644
--- a/x11/qt/Makefile
+++ b/x11/qt/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.72 2006/09/18 10:21:49 espie Exp $
+# $OpenBSD: Makefile,v 1.73 2006/11/21 11:54:02 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 qt"
 COMMENT-html=	"off-line html documentation for qt"
 
@@ -9,7 +9,7 @@ VERSION=	1.45
 DISTNAME=	qt-${VERSION}
 PKGNAME-examples=qt-examples-${VERSION}
 PKGNAME-html=	qt-html-${VERSION}
-PKGNAME=	qt-${VERSION}p1
+PKGNAME-main=	qt-${VERSION}p2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 SHARED_LIBS=	qt	10.0 \
@@ -25,7 +25,6 @@ PERMIT_PACKAGE_CDROM=	"Restrictive license"
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	"Restrictive license"
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		X11 Xext c m stdc++
 
 MAKE_FLAGS=	QT_VER_MAJ=${LIBqt_VERSION:R} QT_VER_MIN=${LIBqt_VERSION:E} \
     QIMGIO_VER_MAJ=${LIBqimgio_VERSION:R} QIMGIO_VER_MIN=${LIBqimgio_VERSION:E}
@@ -34,17 +33,13 @@ USE_X11=	Yes
 USE_GMAKE=	Yes
 MAKE_ENV=	QTDIR="${WRKSRC}" SYS_CXX="${CXX}" SYS_CXXFLAGS="${CXXFLAGS}"
 
-MULTI_PACKAGES=	-examples -html
-SUBPACKAGE?=
+MULTI_PACKAGES=	-main -examples -html
 
-.if defined(PACKAGING)
-.  if ${SUBPACKAGE} == "-examples"
-LIB_DEPENDS+=	lib/qt/qt.>=1::x11/qt
-.  elif ${SUBPACKAGE} == "-html"
-PKG_ARCH=	*
-WANTLIB=
-.  endif
-.endif
+
+WANTLIB=		X11 Xext c m stdc++
+LIB_DEPENDS-examples=	lib/qt/qt.>=1::x11/qt
+PKG_ARCH-html=	*
+WANTLIB-html=	
 
 NO_REGRESS=	Yes
 
diff --git a/x11/qt/pkg/DESCR b/x11/qt/pkg/DESCR-main
similarity index 100%
rename from x11/qt/pkg/DESCR
rename to x11/qt/pkg/DESCR-main
diff --git a/x11/qt/pkg/MESSAGE b/x11/qt/pkg/MESSAGE-main
similarity index 100%
rename from x11/qt/pkg/MESSAGE
rename to x11/qt/pkg/MESSAGE-main
diff --git a/x11/qt/pkg/PFRAG.no-shared b/x11/qt/pkg/PFRAG.no-shared
deleted file mode 100644
index df541e3a7f6..00000000000
--- a/x11/qt/pkg/PFRAG.no-shared
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $OpenBSD: PFRAG.no-shared,v 1.3 2001/06/09 19:53:24 espie Exp $
-lib/qt/libqt.a
-lib/libqimgio.a
diff --git a/x11/qt/pkg/PFRAG.no-shared-main b/x11/qt/pkg/PFRAG.no-shared-main
new file mode 100644
index 00000000000..1f4088e498c
--- /dev/null
+++ b/x11/qt/pkg/PFRAG.no-shared-main
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.no-shared-main,v 1.1 2006/11/21 11:54:02 espie Exp $
+lib/qt/libqt.a
+lib/libqimgio.a
diff --git a/x11/qt/pkg/PFRAG.shared b/x11/qt/pkg/PFRAG.shared-main
similarity index 60%
rename from x11/qt/pkg/PFRAG.shared
rename to x11/qt/pkg/PFRAG.shared-main
index 8cf2936d805..4940dbd413f 100644
--- a/x11/qt/pkg/PFRAG.shared
+++ b/x11/qt/pkg/PFRAG.shared-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.6 2005/12/29 13:09:10 espie Exp $
+@comment $OpenBSD: PFRAG.shared-main,v 1.1 2006/11/21 11:54:02 espie Exp $
 @lib lib/libqimgio.so.${LIBqimgio_VERSION}
 @lib lib/libqt.so.${LIBqt_VERSION}
 @lib lib/qt/libqt.so.${LIBqt_VERSION}
diff --git a/x11/qt/pkg/PLIST b/x11/qt/pkg/PLIST-main
similarity index 99%
rename from x11/qt/pkg/PLIST
rename to x11/qt/pkg/PLIST-main
index beb5091ec3d..d9bb004306f 100644
--- a/x11/qt/pkg/PLIST
+++ b/x11/qt/pkg/PLIST-main
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.20 2005/03/06 14:17:45 espie Exp $
+@comment $OpenBSD: PLIST-main,v 1.1 2006/11/21 11:54:02 espie Exp $
+@pkgpath x11/qt
 bin/moc
 include/X11/qt/
 include/X11/qt/jri.h
diff --git a/x11/qt/qt.port.mk b/x11/qt/qt.port.mk
index cf1222f33e7..e9ba381a1cf 100644
--- a/x11/qt/qt.port.mk
+++ b/x11/qt/qt.port.mk
@@ -1,8 +1,9 @@
-# $OpenBSD: qt.port.mk,v 1.2 2006/08/01 22:55:53 espie Exp $
+# $OpenBSD: qt.port.mk,v 1.3 2006/11/21 11:54:02 espie Exp $
 
 # This fragment uses MODQT_* variables to make it easier to substitute
 # qt1/qt2/qt3 in a port.
-LIB_DEPENDS+=lib/qt/qt.>=1::x11/qt
+MODQT_LIB_DEPENDS=lib/qt/qt.>=1::x11/qt
+LIB_DEPENDS+=${MODQT_LIB_DEPENDS}
 
 MODQT_LIBDIR=	${LOCALBASE}/lib/qt
 MODQT_INCDIR=	${LOCALBASE}/include/X11/qt