diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template
index 5a46cdbb689..36e9168991d 100644
--- a/srcpkgs/mame/template
+++ b/srcpkgs/mame/template
@@ -20,6 +20,7 @@ replaces="sdlmame>=0 sdlmess>=0"
 
 CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.3 -I${XBPS_CROSS_BASE}/usr/include/libutf8proc"
 case "$XBPS_TARGET_MACHINE" in
+	i686*) nodebug=yes ;;
 	*-musl)	CXXFLAGS+=" -DBX_CRT_MUSL=1" ;;
 esac
 
@@ -62,12 +63,21 @@ do_build() {
 			;;
 	esac
 	make ${opts} ${makejobs}
+	if [ "${XBPS_TARGET_MACHINE%-musl}" != "x86_64" ]; then
+		opts=${opts/=arcade/=mess}
+		make ${opts} ${makejobs}
+	fi
 }
 do_install() {
 	local f
 
 	# Install the mame script
-	vbin ${FILESDIR}/${pkgname}.sh ${pkgname}
+	vbin ${FILESDIR}/mame.sh mame
+
+	# If mess is a separate binary, also install the mess script
+	if [ "${XBPS_TARGET_MACHINE%-musl}" != "x86_64" ]; then
+		vbin ${FILESDIR}/mess.sh mess
+	fi
 
 	# Install the main application(s)
 	for f in mame mame64 mamearcade mamearcade64; do