diff --git a/x11/artwiz-aleczapka/Makefile b/x11/artwiz-aleczapka/Makefile
index 8bda6d9dbb0..4e61dcb7804 100755
--- a/x11/artwiz-aleczapka/Makefile
+++ b/x11/artwiz-aleczapka/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.2 2006/10/21 11:47:42 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.3 2006/11/21 09:20:27 espie Exp $
 
-COMMENT=	"improved artwiz fonts"
+COMMENT-main=	"improved artwiz fonts"
 COMMENT-de=	"improved artwiz fonts (german pack)"
 COMMENT-se=	"improved artwiz fonts (swedish pack)"
 
 V=		1.3
 NAME=		artwiz-aleczapka
 DISTNAME=	${NAME}-en-${V}
-PKGNAME=	${NAME}-${V}p0
+PKGNAME-main=	${NAME}-${V}p1
 PKGNAME-de=	${NAME}-de-${V}
 PKGNAME-se=	${NAME}-se-${V}
 CATEGORIES=	x11
@@ -36,12 +36,10 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${NAME}-de-${V}${EXTRACT_SUFX} \
 		${NAME}-se-${V}${EXTRACT_SUFX}
 
-MULTI_PACKAGES=	-de -se
-SUBPACKAGE?=
+MULTI_PACKAGES=	-main -de -se
 
-.if defined(PACKAGING) && !empty(SUBPACKAGE)
-RUN_DEPENDS=	:artwiz-aleczapka->=${V}:x11/artwiz-aleczapka
-.endif
+RUN_DEPENDS-de=	:artwiz-aleczapka->=${V}:x11/artwiz-aleczapka
+RUN_DEPENDS-se=	:artwiz-aleczapka->=${V}:x11/artwiz-aleczapka
 
 do-install:
 	${INSTALL_DATA_DIR} ${INST_DIR}
diff --git a/x11/artwiz-aleczapka/pkg/DESCR b/x11/artwiz-aleczapka/pkg/DESCR-main
similarity index 100%
rename from x11/artwiz-aleczapka/pkg/DESCR
rename to x11/artwiz-aleczapka/pkg/DESCR-main
diff --git a/x11/artwiz-aleczapka/pkg/PLIST b/x11/artwiz-aleczapka/pkg/PLIST-main
similarity index 90%
rename from x11/artwiz-aleczapka/pkg/PLIST
rename to x11/artwiz-aleczapka/pkg/PLIST-main
index d779d1ef5fd..4acbb61bf72 100644
--- a/x11/artwiz-aleczapka/pkg/PLIST
+++ b/x11/artwiz-aleczapka/pkg/PLIST-main
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2006/10/21 11:47:42 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.1 2006/11/21 09:20:27 espie Exp $
+@pkgpath x11/artwiz-aleczapka
 lib/X11/fonts/
 @fontdir lib/X11/fonts/artwiz-aleczapka/
 lib/X11/fonts/artwiz-aleczapka/anorexia.pcf