diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template
index 46dbaac8437..6c69fd14767 100644
--- a/srcpkgs/mame/template
+++ b/srcpkgs/mame/template
@@ -1,6 +1,6 @@
 # Template file for 'mame'
 pkgname=mame
-version=0199
+version=0200
 revision=1
 wrksrc="mame-mame${version}"
 homepage="http://mamedev.org"
@@ -8,7 +8,7 @@ distfiles="https://github.com/mamedev/mame/archive/mame${version}.tar.gz"
 short_desc="The Multiple Arcade Machine Emulator"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-2.0-or-later"
-checksum=cf4511d6c893e699fd5bc510133aee75c852942321e1c668c9d5802229bec116
+checksum=a6c43323e120f55b32c072726bdda357aa221a599070989b6e3406ee4e3983fe
 
 hostmakedepends="automoc4 perl pkg-config python"
 makedepends="SDL2_ttf-devel glm libjpeg-turbo-devel libutf8proc-devel
@@ -20,7 +20,13 @@ 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 ;;
+	i686*)	# Can no longer build separate arcade and mess targets for i686
+		# If the builder can't handle linking for i686 due to memory
+		# constraints, mame will be broken for i686 from now on
+		nodebug=yes
+		;;
+esac
+case "$XBPS_TARGET_MACHINE" in
 	*-musl)	CXXFLAGS+=" -DBX_CRT_MUSL=1" ;;
 esac
 
@@ -32,10 +38,6 @@ fi
 do_build() {
 	local opts="REGENIE=1"
 	opts+=" TARGETOS=linux"
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) opts+=" SUBTARGET=arcade" ;;
-		x86_64*|aarch64*) opts+=" PTR64=1" ;;
-	esac
 	opts+=" NOWERROR=1"
 	opts+=" OPTIMIZE=3"
 	opts+=" TOOLS=1"
@@ -51,22 +53,22 @@ do_build() {
 	opts+=" USE_SYSTEM_LIB_GLM=1"
 	opts+=" USE_SYSTEM_LIB_RAPIDJSON=1"
 	[ "$build_option_qt" ] && opts+=" USE_QTDEBUG=1"
+	case "$XBPS_TARGET_MACHINE" in
+		i686*)	# Overcome linker memory exhaustion
+			opts+=" SYMBOLS=0"
+			;;
+		x86_64*|aarch64*)
+			opts+=" PTR64=1"
+			;;
+	esac
 	if [ "${CROSS_BUILD}" ]; then
 		# Doesn't work yet
 		opts+=" CROSS_BUILD=1 TOOLCHAIN=${XBPS_CROSS_TRIPLET}"
 		opts+=" OVERRIDE_CC=gcc OVERRIDE_CXX=g++ OVERRIDE_LD=g++"
 	fi
-	case "$XBPS_TARGET_MACHINE" in
-		i686*)	# Overcome linker memory exhaustion
-			opts+=" SYMBOLS=0"
-			;;
-	esac
 	make ${opts} ${makejobs}
-	if [ "${XBPS_TARGET_MACHINE%-musl}" != "x86_64" ]; then
-		opts=${opts/=arcade/=mess}
-		make ${opts} ${makejobs}
-	fi
 }
+
 do_install() {
 	local f