diff --git a/x11/matchbox/matchbox-panel/Makefile b/x11/matchbox/matchbox-panel/Makefile
index 6477c9accf9..56094a5522d 100644
--- a/x11/matchbox/matchbox-panel/Makefile
+++ b/x11/matchbox/matchbox-panel/Makefile
@@ -1,4 +1,5 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2005/06/17 02:57:30 jolan Exp $
+# $OpenBSD: Makefile,v 1.2 2005/06/30 21:50:51 jolan Exp $
+# XXX hardcoded apm list
 
 COMMENT=	"window bar for holding application launchers"
 DISTNAME=	matchbox-panel-0.9.2
@@ -30,4 +31,11 @@ CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng"
 		INTLIBS="-liconv -lintl" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "macppc" \
+	|| ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "zaurus"
+PKG_ARGS+=-DAPM=1
+.else
+PKG_ARGS+=-DAPM=0
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11/matchbox/matchbox-panel/pkg/PFRAG.APM b/x11/matchbox/matchbox-panel/pkg/PFRAG.APM
new file mode 100644
index 00000000000..387e8e5937e
--- /dev/null
+++ b/x11/matchbox/matchbox-panel/pkg/PFRAG.APM
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.APM,v 1.1 2005/06/30 21:50:51 jolan Exp $
+bin/mb-applet-battery
+share/applications/mb-applet-battery.desktop
diff --git a/x11/matchbox/matchbox-panel/pkg/PLIST b/x11/matchbox/matchbox-panel/pkg/PLIST
index 89860a89db9..a26cb013ca8 100644
--- a/x11/matchbox/matchbox-panel/pkg/PLIST
+++ b/x11/matchbox/matchbox-panel/pkg/PLIST
@@ -1,13 +1,12 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2005/06/17 02:57:30 jolan Exp $
+@comment $OpenBSD: PLIST,v 1.2 2005/06/30 21:50:51 jolan Exp $
+%%APM%%
 bin/matchbox-panel
-bin/mb-applet-battery
 bin/mb-applet-clock
 bin/mb-applet-launcher
 bin/mb-applet-menu-launcher
 @comment bin/mb-applet-system-monitor
 @comment bin/mb-applet-xterm-wrapper.sh
 share/applications/
-share/applications/mb-applet-battery.desktop
 share/applications/mb-applet-clock.desktop
 share/applications/mb-applet-menu-launcher.desktop
 @comment share/applications/mb-applet-system-monitor.desktop