diff --git a/x11/matchbox/matchbox-panel/Makefile b/x11/matchbox/matchbox-panel/Makefile
index 56094a5522d..0fe26e24589 100644
--- a/x11/matchbox/matchbox-panel/Makefile
+++ b/x11/matchbox/matchbox-panel/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2005/06/30 21:50:51 jolan Exp $
+# $OpenBSD: Makefile,v 1.3 2005/07/25 18:08:27 jolan Exp $
 # XXX hardcoded apm list
 
 COMMENT=	"window bar for holding application launchers"
 DISTNAME=	matchbox-panel-0.9.2
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	x11
 MASTER_SITES=	http://projects.o-hand.com/matchbox/sources/matchbox-panel/0.9/
 
@@ -31,11 +32,11 @@ CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng"
 		INTLIBS="-liconv -lintl" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+.include <bsd.port.mk>
+
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "macppc" \
-	|| ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "zaurus"
+	|| ${MACHINE_ARCH} == "sparc" || ${ARCH} == "zaurus"
 PKG_ARGS+=-DAPM=1
 .else
 PKG_ARGS+=-DAPM=0
 .endif
-
-.include <bsd.port.mk>