diff --git a/packages/emulation/libretro-mame2015/package.mk b/packages/emulation/libretro-mame2015/package.mk
index cc6fc3624c..04a52bfac9 100644
--- a/packages/emulation/libretro-mame2015/package.mk
+++ b/packages/emulation/libretro-mame2015/package.mk
@@ -9,38 +9,29 @@ PKG_SITE="https://github.com/libretro/mame2015-libretro"
 PKG_URL="https://github.com/libretro/mame2015-libretro/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Late 2014/Early 2015 version of MAME (0.160-ish) for libretro. Compatible with MAME 0.160 romsets."
+PKG_TOOLCHAIN="make"
 
 PKG_LIBNAME="mame2015_libretro.so"
 PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="MAME2015_LIB"
 
-pre_make_target() {
+PKG_MAKE_OPTS_TARGET="GIT_VERSION=${PKG_VERSION:0:7}"
+
+pre_configure_target() {
+  if [ "${ARCH}" = "arm" ]; then
+    PKG_MAKE_OPTS_TARGET+=" platform=armv"
+    # ARM NEON support
+    if target_has_feature neon; then
+      PKG_MAKE_OPTS_TARGET+="-neon"
+    fi
+    PKG_MAKE_OPTS_TARGET+="-${TARGET_FLOAT}float-${TARGET_CPU}"
+  fi
+  # Fix build
   export REALCC=${CC}
   export CC=${CXX}
   export LD=${CXX}
 }
 
-make_target() {
-  case ${TARGET_CPU} in
-    arm1176jzf-s)
-      make platform=armv6-hardfloat-${TARGET_CPU}
-      ;;
-    cortex-a7|cortex-a9)
-      make platform=armv7-neon-hardfloat-${TARGET_CPU}
-      ;;
-    *cortex-a53|cortex-a17)
-      if [ "${TARGET_ARCH}" = "aarch64" ]; then
-        make platform=aarch64
-      else
-        make platform=armv7-neon-hardfloat-cortex-a9
-      fi
-      ;;
-    x86-64)
-      make
-      ;;
-  esac
-}
-
 makeinstall_target() {
   mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}
   cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME}