diff --git a/print/lout/Makefile b/print/lout/Makefile
index 6e0a24c5e7a..27755607de5 100644
--- a/print/lout/Makefile
+++ b/print/lout/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2006/08/09 15:26:05 bernd Exp $
+# $OpenBSD: Makefile,v 1.4 2006/11/24 22:20:29 kili Exp $
 
-COMMENT= 	"object oriented type setting language"
+COMMENT-main= 	"object oriented type setting language"
 COMMENT-doc=	"Lout user and expert documentation"
 
 DISTNAME=       lout-3.30
-PKGNAME=	${DISTNAME}p0
+PKGNAME-main=	${DISTNAME}p1
 PKGNAME-doc=    ${DISTNAME:S/-/-doc-/}p0
 CATEGORIES=	print
 
@@ -25,12 +25,9 @@ NO_REGRESS=	Yes
 
 WANTLIB=	c m z
 
-MULTI_PACKAGES=	-doc
-SUBPACKAGE?=
+MULTI_PACKAGES=	-doc -main
 
-.if defined(PACKAGING) && ${SUBPACKAGE} == "-doc"
-PKG_ARCH=               *
-WANTLIB=
-.endif
+PKG_ARCH-doc=	*
+WANTLIB-doc=
 
 .include <bsd.port.mk>
diff --git a/print/lout/pkg/DESCR b/print/lout/pkg/DESCR-main
similarity index 100%
rename from print/lout/pkg/DESCR
rename to print/lout/pkg/DESCR-main
diff --git a/print/lout/pkg/PLIST b/print/lout/pkg/PLIST-main
similarity index 98%
rename from print/lout/pkg/PLIST
rename to print/lout/pkg/PLIST-main
index b02facb6927..e7cb56c0e62 100644
--- a/print/lout/pkg/PLIST
+++ b/print/lout/pkg/PLIST-main
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2006/08/09 15:26:05 bernd Exp $
+@comment $OpenBSD: PLIST-main,v 1.1 2006/11/24 22:20:29 kili Exp $
+@pkgpath print/lout
 bin/lout
 bin/prg2lout
 lib/lout/