diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index 5d44be0f..a6f3818b 100644
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -282,6 +282,20 @@ build_libretro_mame078()
    fi
 }
 
+build_libretro_vbam()
+{
+   cd "$BASE_DIR"
+   if [ -d "libretro-vbam" ]; then
+      echo "=== Building VBA-M ==="
+      cd libretro-vbam/src/libretro
+      ${MAKE} -f Makefile platform=$FORMAT_COMPILER_TARGET_ALT $COMPILER -j$JOBS clean || die "Failed to clean VBA-M"
+      ${MAKE} -f Makefile platform=$FORMAT_COMPILER_TARGET_ALT $COMPILER -j$JOBS || die "Failed to build VBA-M"
+      cp vbam_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
+   else
+      echo "VBA-M not fetched, skipping ..."
+   fi
+}
+
 build_libretro_vba_next()
 {
    cd "$BASE_DIR"
diff --git a/libretro-build.sh b/libretro-build.sh
index 47d1bd98..4bd24fa7 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -93,6 +93,7 @@ else
    build_libretro_s9x_next
    build_libretro_genplus
    build_libretro_fba_full
+   build_libretro_vbam
    build_libretro_vba_next
    build_libretro_bnes
    build_libretro_fceu