diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index 9f9b009f8c7..3d01ed3b38b 100755
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2010/07/05 08:25:08 espie Exp $
+# $OpenBSD: Makefile,v 1.26 2010/07/06 13:02:14 espie Exp $
 
 COMMENT-main=	framework for Multicast DNS Service Discovery
 COMMENT-gtk=	GUI client utilities for avahi
@@ -57,8 +57,19 @@ LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
 		daemon::devel/libdaemon \
 		dbus-1::x11/dbus
 
+ONLY_FOR_ARCHS-mono = i386 amd64 powerpc
+
+BUILD_MONO = No
 .if !${FLAVOR:L:Mno_mono}
 MULTI_PACKAGES+= -mono
+.  for _a in ${MACHINE_ARCH} ${ARCH}
+.    if ${ONLY_FOR_ARCHS-mono:M${_a}}
+BUILD_MONO = Yes
+.    endif
+.  endfor
+.endif
+
+.if ${BUILD_MONO:L} == "yes"
 MODULES+=	lang/mono
 BUILD_DEPENDS+=	${MODMONO_BUILD_DEPENDS} \
 		::x11/mono-gtk2
@@ -72,7 +83,7 @@ CONFIGURE_ARGS+= --disable-mono \
 		--disable-monodoc
 .endif
 
-.if !${FLAVOR:L:Mno_gtk} || !${FLAVOR:L:Mno_mono}
+.if !${FLAVOR:L:Mno_gtk} || ${BUILD_MONO:L} == "yes"
 MULTI_PACKAGES+= -gtk
 MODULES+=	lang/python
 BUILD_DEPENDS+=	:python-gdbm-*:lang/python/${MODPY_VERSION},-gdbm \
diff --git a/x11/gnome/applets2/Makefile b/x11/gnome/applets2/Makefile
index 8b8e7c0307c..7438e000427 100644
--- a/x11/gnome/applets2/Makefile
+++ b/x11/gnome/applets2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.91 2010/07/01 17:56:31 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.92 2010/07/06 13:02:14 espie Exp $
 
 COMMENT-main=		applets for use with the GNOME panel
 COMMENT-battstat=	GNOME applet for monitoring battery level
@@ -47,16 +47,10 @@ LIB_DEPENDS-main=	${LIB_DEPENDS} \
 			gtop-2.0.>=3.0::devel/libgtop2 \
 			gucharmap:gucharmap->=1.8:x11/gnome/gucharmap
 
-PSEUDO_FLAVORS=		no_battstat
-FLAVOR?=
-
-MULTI_PACKAGES=		-main
-.if ${FLAVOR:L:Mno_battstat}
-CONFIGURE_ARGS+=	--disable-battstat
-.else
-MULTI_PACKAGES+=	-battstat
+MULTI_PACKAGES=		-main -battstat
+ONLY_FOR_ARCHS-battstat = ${APM_ARCHS}
 RUN_DEPENDS-battstat=	::${BUILD_PKGPATH},-main
-.endif
+
 
 MODGCONF2_SCHEMAS_DIR=	gnome-applets2
 
@@ -86,10 +80,12 @@ pre-configure:
 
 .include <bsd.port.mk>
 
-CONFIGURE_ARGS+=	--sysconfdir="${SYSCONFDIR}/gnome"
-
 .for m in ${MACHINE_ARCH} ${MACHINE}
-.if ${APM_ARCHS:L:M$m}
-FLAVOR+=	no_battstat
-.endif
+.  if ${APM_ARCHS:L:M$m}
+ENABLE_BATTSTAT=Yes
+.  endif
 .endfor
+.if !defined(ENABLE_BATTSTAT)
+CONFIGURE_ARGS+=	--disable-battstat
+.endif
+CONFIGURE_ARGS+=	--sysconfdir="${SYSCONFDIR}/gnome"