diff --git a/libretro-build-android-mk.sh b/libretro-build-android-mk.sh
index 8c97b5c8..7b2d048f 100755
--- a/libretro-build-android-mk.sh
+++ b/libretro-build-android-mk.sh
@@ -37,6 +37,26 @@ die()
    #exit 1
 }
 
+build_libretro_beetle_bsnes()
+{
+   cd $BASE_DIR
+   pwd
+   if [ -d "libretro-beetle-bsnes" ]; then
+      cd libretro-beetle-bsnes
+      cd jni
+      echo "=== Building Beetle bSNES ==="
+      if [ -z "${NOCLEAN}" ]; then
+         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Beetle bSNES"
+      fi
+      ndk-build APP_ABI="armeabi-v7a mips x86" || die "Failed to build Beetle bSNES"
+      cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/mednafen_bsnes_libretro${FORMAT}.${FORMAT_EXT}
+      cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/mednafen_bsnes_libretro${FORMAT}.${FORMAT_EXT}
+      cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/mednafen_bsnes_libretro${FORMAT}.${FORMAT_EXT}
+   else
+      echo "Beetle bSNES not fetched, skipping ..."
+   fi
+}
+
 build_libretro_beetle_lynx()
 {
    cd $BASE_DIR
@@ -772,7 +792,7 @@ if [ $1 ]; then
 else
    #build_libretro_bsnes_cplusplus98
    build_libretro_bsnes
-   #build_libretro_beetle_lynx
+   build_libretro_beetle_lynx
    build_libretro_beetle_gba
    build_libretro_beetle_ngp
    build_libretro_beetle_pce_fast
@@ -781,7 +801,7 @@ else
    build_libretro_beetle_vb
    build_libretro_beetle_wswan
    build_libretro_beetle_psx
-   #build_libretro_beetle_snes
+   build_libretro_beetle_bsnes
    build_libretro_s9x
    build_libretro_s9x_next
    build_libretro_genplus
diff --git a/libretro-build-common-xdk.sh b/libretro-build-common-xdk.sh
index 1f090584..6b26ddaf 100644
--- a/libretro-build-common-xdk.sh
+++ b/libretro-build-common-xdk.sh
@@ -6,20 +6,18 @@ die()
    #exit 1
 }
 
-build_libretro_mednafen()
+build_libretro_beetle_bsnes()
 {
-   for core in gba; do
-   	cd $BASE_DIR
-   	if [ -d "libretro-mednafen" ]; then
-      		echo "=== Building Mednafen ${core} ==="
-      		cd libretro-mednafen
-      		cd msvc/${core}
-      		cmd.exe /k $MSVC_NAME.bat
-      		cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/mednafen_${core}_libretro$FORMAT.$FORMAT_EXT
-   	else
-      		echo "Mednafen not fetched, skipping ..."
-   	fi
-   done
+   cd $BASE_DIR
+   if [ -d "libretro-beetle-bsnes" ]; then
+      echo "=== Building Beetle bSNES ==="
+      cd libretro-beetle-bsnes
+      cd msvc
+      cmd.exe /k $MSVC_NAME.bat
+      cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/mednafen_bsnes_libretro$FORMAT.$FORMAT_EXT
+   else
+      echo "Beetle bSNES not fetched, skipping ..."
+   fi
 }
 
 build_libretro_beetle_lynx()
diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index 73dfb5f6..be013502 100755
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -174,6 +174,21 @@ build_libretro_pcsx_rearmed_interpreter() {
    fi
 }
 
+build_libretro_beetle_bsnes()
+{
+   cd "${BASE_DIR}"
+   if [ -d 'libretro-beetle-bsnes' ]; then
+      echo '=== Building Beetle bSNES ==='
+      cd libretro-beetle-bsnes
+
+      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die "Failed to clean beetle/bsnes"
+      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die "Failed to build beetle/bsnes"
+      cp "mednafen_bsnes_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}"
+   else
+      echo 'Beetle bSNES not fetched, skipping ...'
+   fi
+}
+
 build_libretro_beetle_lynx()
 {
    cd "${BASE_DIR}"
diff --git a/libretro-build-ios.sh b/libretro-build-ios.sh
index 9ef7612b..1b32408f 100755
--- a/libretro-build-ios.sh
+++ b/libretro-build-ios.sh
@@ -38,7 +38,7 @@ else
    build_libretro_beetle_vb
    build_libretro_beetle_wswan
    build_libretro_beetle_psx
-   #build_libretro_beetle_snes
+   build_libretro_beetle_bsnes
    build_libretro_s9x
    build_libretro_s9x_next
    build_libretro_genplus
diff --git a/libretro-build-ngc.sh b/libretro-build-ngc.sh
index 5178d8f9..52c0e86e 100755
--- a/libretro-build-ngc.sh
+++ b/libretro-build-ngc.sh
@@ -25,6 +25,7 @@ else
    build_libretro_beetle_pcfx
    build_libretro_beetle_vb
    build_libretro_beetle_wswan
+   build_libretro_beetle_bsnes
    build_libretro_s9x_next
    build_libretro_genplus
    build_libretro_fba
diff --git a/libretro-build-ps3.sh b/libretro-build-ps3.sh
index 48808ebf..ee5cdc48 100755
--- a/libretro-build-ps3.sh
+++ b/libretro-build-ps3.sh
@@ -25,6 +25,7 @@ else
    build_libretro_beetle_vb
    build_libretro_beetle_wswan
    build_libretro_beetle_psx
+   build_libretro_beetle_bsnes
    build_libretro_s9x_next
    build_libretro_genplus
    build_libretro_fba_full
diff --git a/libretro-build-psp1.sh b/libretro-build-psp1.sh
index bcda27c7..edb3f2dd 100755
--- a/libretro-build-psp1.sh
+++ b/libretro-build-psp1.sh
@@ -24,6 +24,7 @@ else
    build_libretro_beetle_pcfx
    build_libretro_beetle_vb
    build_libretro_beetle_wswan
+   build_libretro_beetle_bsnes
    build_libretro_mednafen
    build_libretro_s9x_next
    build_libretro_genplus
diff --git a/libretro-build-qnx.sh b/libretro-build-qnx.sh
index e685c002..3f673b86 100755
--- a/libretro-build-qnx.sh
+++ b/libretro-build-qnx.sh
@@ -26,6 +26,7 @@ else
    build_libretro_beetle_vb
    build_libretro_beetle_wswan
    build_libretro_beetle_psx
+   build_libretro_beetle_bsnes
    build_libretro_s9x
    build_libretro_s9x_next
    build_libretro_genplus
diff --git a/libretro-build-wii.sh b/libretro-build-wii.sh
index 5119dea7..7b32b29d 100755
--- a/libretro-build-wii.sh
+++ b/libretro-build-wii.sh
@@ -26,6 +26,7 @@ else
    build_libretro_beetle_psx
    build_libretro_beetle_vb
    build_libretro_beetle_wswan
+   build_libretro_beetle_bsnes
    build_libretro_s9x_next
    build_libretro_genplus
    build_libretro_fba
diff --git a/libretro-build-win.sh b/libretro-build-win.sh
index 1afa9c20..a26d3ad6 100644
--- a/libretro-build-win.sh
+++ b/libretro-build-win.sh
@@ -28,6 +28,7 @@ else
    build_libretro_beetle_pcfx
    build_libretro_beetle_vb
    build_libretro_beetle_wswan
+   #build_libretro_beetle_bsnes
    build_libretro_s9x
    build_libretro_s9x_next
    build_libretro_genplus
diff --git a/libretro-build-xdk1.sh b/libretro-build-xdk1.sh
index 65d7781e..e1f0160d 100644
--- a/libretro-build-xdk1.sh
+++ b/libretro-build-xdk1.sh
@@ -87,6 +87,7 @@ else
    build_libretro_beetle_pcfx
    build_libretro_beetle_vb
    build_libretro_beetle_wswan
+   #build_libretro_beetle_bsnes
    build_libretro_s9x_next
    build_libretro_genplus
    build_libretro_fba
diff --git a/libretro-build-xdk360.sh b/libretro-build-xdk360.sh
index 0f1c3e1c..79164a87 100644
--- a/libretro-build-xdk360.sh
+++ b/libretro-build-xdk360.sh
@@ -43,6 +43,7 @@ else
    build_libretro_beetle_pcfx
    build_libretro_beetle_vb
    build_libretro_beetle_wswan
+   #build_libretro_beetle_bsnes
    build_libretro_s9x_next
    build_libretro_genplus
    build_libretro_fba
diff --git a/libretro-fetch.sh b/libretro-fetch.sh
index 01818c61..5142d626 100755
--- a/libretro-fetch.sh
+++ b/libretro-fetch.sh
@@ -102,6 +102,7 @@ fetch_project "$REPO_BASE/libretro/beetle-pce-fast-libretro.git" "libretro-beetl
 fetch_project "$REPO_BASE/libretro/beetle-supergrafx-libretro.git" "libretro-beetle-supergrafx" "libretro/Beetle SuperGrafx"
 fetch_project "$REPO_BASE/libretro/beetle-psx-libretro.git" "libretro-beetle-psx" "libretro/Beetle PSX"
 fetch_project "$REPO_BASE/libretro/beetle-pcfx-libretro.git" "libretro-beetle-pcfx" "libretro/Beetle PCFX"
+fetch_project "$REPO_BASE/libretro/beetle-bsnes-libretro.git" "libretro-beetle-bsnes" "libretro/Beetle bSNES"
 fetch_project "$REPO_BASE/libretro/beetle-vb-libretro.git" "libretro-beetle-vb" "libretro/Beetle VB"
 fetch_project "$REPO_BASE/libretro/beetle-wswan-libretro.git" "libretro-beetle-wswan" "libretro/Beetle WSwan"
 fetch_project "$REPO_BASE/libretro/scummvm.git" "libretro-scummvm" "libretro/scummvm"