diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template
index 67b4651442a..654ba3ead80 100644
--- a/srcpkgs/mame/template
+++ b/srcpkgs/mame/template
@@ -1,6 +1,6 @@
 # Template file for 'mame'
 pkgname=mame
-version=0172
+version=0173
 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"
-checksum=8e7f4dddf987b51c0166b4ca27443977ebea2618249e81dfc0066c3a3f4efb45
+checksum=499172e28eb53f30b3036a036c3834f0a865d5505f7234aebd49145358621654
 
 hostmakedepends="perl pkg-config python automoc4"
 makedepends="SDL2_ttf-devel $(vopt_if qt qt5-devel) lua-devel libjpeg-turbo-devel
@@ -17,12 +17,8 @@ depends="liberation-fonts-ttf"
 nocross=yes
 replaces="sdlmame>=0 sdlmess>=0"
 
-# ETOOBIG for i686
-case "$XBPS_TARGET_MACHINE" in
-	i686*)	broken="http://build.voidlinux.eu/builders/i686_builder/builds/21957/steps/shell_3/logs/stdio"
-esac
-
 CXXFLAGS="-DUSE_INTERNAL_CBEGIN_CEND=1 -I${XBPS_CROSS_BASE}/usr/include/lua5.3"
+LDFLAGS="-Wl,-fuse-ld=gold"
 
 build_options="qt"
 if [ -z "$CROSS_BUILD" ]; then
@@ -51,7 +47,15 @@ do_build() {
 		# Doesn't work yet
 		opts+=" CROSS_BUILD=1 OVERRIDE_CC=${CC} OVERRIDE_CXX=${CXX} OVERRIDE_LD=${CC}"
 	fi
-	make ${opts} ${makejobs}
+	case "$XBPS_TARGET_MACHINE" in
+		i686*)	# Build mame and mess separately
+			make ${opts} SUBTARGET=arcade ${makejobs}
+			make ${opts} SUBTARGET=mess ${makejobs}
+			;;
+		*)	# Build all in one mame
+			make ${opts} ${makejobs}
+			;;
+	esac
 }
 do_install() {
 	local f
@@ -62,20 +66,26 @@ do_install() {
 	# Install the applications and the UI font in /usr/share/${pkgname}
 	if [ -r mame64 ]; then
 		vinstall mame64 755 usr/share/${pkgname} ${pkgname}
-	else
+	fi
+	if [ -r mame ]; then
 		vinstall mame 755 usr/share/${pkgname} ${pkgname}
 	fi
+	if [ -r arcade ]; then
+		vinstall arcade 755 usr/share/${pkgname} ${pkgname}
+	fi
+	if [ -r mess ]; then
+		vinstall mess 755 usr/share/${pkgname}
+	fi
 
-	for f in chdman jedutil regrep romcmp testkeys src2html srcclean \
+	for f in chdman jedutil regrep pngcmp romcmp src2html srcclean \
 		ldverify ldresample unidasm castool floptool imgtool; do
 		vinstall ${f} 755 usr/share/${pkgname}
 		if [ -f src/osd/sdl/man/${f}.1 ]; then
 			vman src/osd/sdl/man/${f}.1
 		fi
 	done
-	vman src/osd/sdl/man/mame.6
-	# Currently mess.6 still exists, so install it as well
-	vman src/osd/sdl/man/mess.6
+	[ -r docs/man/mame.6 ] && vman docs/man/mame.6
+	[ -r docs/man/mess.6 ] && vman docs/man/mess.6
 
 	# Install the extra bits
 	for f in artwork bgfx docs hash hlsl keymaps plugins samples; do