diff --git a/libretro-build-android-mk.sh b/libretro-build-android-mk.sh
index 8f6e13c9..991df084 100755
--- a/libretro-build-android-mk.sh
+++ b/libretro-build-android-mk.sh
@@ -180,6 +180,26 @@ build_libretro_beetle_pce_fast()
    fi
 }
 
+build_libretro_beetle_supergrafx()
+{
+   cd $BASE_DIR
+   pwd
+   if [ -d "libretro-beetle-supergrafx" ]; then
+      cd libretro-beetle-supergrafx
+      cd jni
+      echo "=== Building Beetle SuperGrafx ==="
+      if [ -z "${NOCLEAN}" ]; then
+         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Beetle SuperGrafx"
+      fi
+      ndk-build APP_ABI="armeabi-v7a mips x86" || die "Failed to build Beetle SuperGrafx"
+      cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/mednafen_supergrafx_libretro${FORMAT}.${FORMAT_EXT}
+      cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/mednafen_supergrafx_libretro${FORMAT}.${FORMAT_EXT}
+      cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/mednafen_supergrafx_libretro${FORMAT}.${FORMAT_EXT}
+   else
+      echo "Beetle SuperGrafx not fetched, skipping ..."
+   fi
+}
+
 build_libretro_s9x()
 {
    cd $BASE_DIR
@@ -740,6 +760,7 @@ else
    build_libretro_mednafen
    build_libretro_mednafen_ngp
    build_libretro_mednafen_pce_fast
+   build_libretro_mednafen_supergrafx
    build_libretro_mednafen_pcfx
    build_libretro_mednafen_vb
    build_libretro_mednafen_wswan
diff --git a/libretro-build-common-xdk.sh b/libretro-build-common-xdk.sh
index c723bb77..6bbb9fc2 100644
--- a/libretro-build-common-xdk.sh
+++ b/libretro-build-common-xdk.sh
@@ -64,6 +64,20 @@ build_libretro_beetle_pce_fast()
    fi
 }
 
+build_libretro_beetle_supergrafx()
+{
+   cd $BASE_DIR
+   if [ -d "libretro-beetle-supergrafx" ]; then
+      echo "=== Building Beetle SuperGrafx ==="
+      cd libretro-beetle-supergrafx
+      cd msvc
+      cmd.exe /k $MSVC_NAME.bat
+      cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/mednafen_supergrafx_libretro$FORMAT.$FORMAT_EXT
+   else
+      echo "Beetle SuperGrafx not fetched, skipping ..."
+   fi
+}
+
 build_libretro_beetle_pcfx()
 {
    cd $BASE_DIR
diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index d8ea2d34..8a00c289 100755
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -234,6 +234,20 @@ build_libretro_beetle_pce_fast() {
    fi
 }
 
+build_libretro_beetle_supergrafx() {
+   cd "${BASE_DIR}"
+   if [ -d 'libretro-beetle-supergrafx' ]; then
+      echo '=== Building Beetle SuperGrafx ==='
+      cd libretro-beetle-supergrafx
+
+      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die "Failed to clean beetle/supergrafx"
+      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die "Failed to build beetle/supergrafx"
+      cp "mednafen_supergrafx_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}"
+   else
+      echo 'Beetle SuperGrafx not fetched, skipping ...'
+   fi
+}
+
 build_libretro_beetle_vb() {
    cd "${BASE_DIR}"
    if [ -d 'libretro-beetle-vb' ]; then
diff --git a/libretro-build-ios.sh b/libretro-build-ios.sh
index a41135b0..6f6729ab 100755
--- a/libretro-build-ios.sh
+++ b/libretro-build-ios.sh
@@ -32,6 +32,7 @@ else
    build_libretro_mednafen
    build_libretro_beetle_ngp
    build_libretro_beetle_pce_fast
+   build_libretro_beetle_supergrafx
    build_libretro_beetle_pcfx
    build_libretro_beetle_vb
    build_libretro_beetle_wswan
diff --git a/libretro-build-ngc.sh b/libretro-build-ngc.sh
index a6185bba..7f048cd9 100755
--- a/libretro-build-ngc.sh
+++ b/libretro-build-ngc.sh
@@ -20,6 +20,7 @@ else
    build_libretro_mednafen
    build_libretro_beetle_ngp
    build_libretro_beetle_pce_fast
+   build_libretro_beetle_supergrafx
    build_libretro_beetle_pcfx
    build_libretro_beetle_vb
    build_libretro_beetle_wswan
diff --git a/libretro-build-ps3.sh b/libretro-build-ps3.sh
index a57f37f0..ec359682 100755
--- a/libretro-build-ps3.sh
+++ b/libretro-build-ps3.sh
@@ -19,6 +19,7 @@ else
    build_libretro_mednafen
    build_libretro_beetle_ngp
    build_libretro_beetle_pce_fast
+   build_libretro_beetle_supergrafx
    build_libretro_beetle_pcfx
    build_libretro_beetle_vb
    build_libretro_beetle_wswan
diff --git a/libretro-build-psp1.sh b/libretro-build-psp1.sh
index 39061f56..28352d61 100755
--- a/libretro-build-psp1.sh
+++ b/libretro-build-psp1.sh
@@ -18,6 +18,7 @@ if [ $1 ]; then
 else
    build_libretro_beetle_ngp
    build_libretro_beetle_pce_fast
+   build_libretro_beetle_supergrafx
    build_libretro_beetle_pcfx
    build_libretro_beetle_vb
    build_libretro_beetle_wswan
diff --git a/libretro-build-qnx.sh b/libretro-build-qnx.sh
index 2f3f7468..fa326d5d 100755
--- a/libretro-build-qnx.sh
+++ b/libretro-build-qnx.sh
@@ -20,6 +20,7 @@ else
    #build_libretro_bsnes
    build_libretro_mednafen
    build_libretro_beetle_pce_fast
+   build_libretro_beetle_supergrafx
    build_libretro_beetle_pcfx
    build_libretro_beetle_vb
    build_libretro_beetle_wswan
diff --git a/libretro-build-wii.sh b/libretro-build-wii.sh
index acded769..78ac2d78 100755
--- a/libretro-build-wii.sh
+++ b/libretro-build-wii.sh
@@ -20,6 +20,7 @@ else
    build_libretro_mednafen
    build_libretro_beetle_ngp
    build_libretro_beetle_pce_fast
+   build_libretro_beetle_supergrafx
    build_libretro_beetle_pcfx
    build_libretro_beetle_psx
    build_libretro_beetle_vb
diff --git a/libretro-build-win.sh b/libretro-build-win.sh
index d192591c..5945b0ac 100644
--- a/libretro-build-win.sh
+++ b/libretro-build-win.sh
@@ -23,6 +23,7 @@ else
    build_libretro_mednafen
    build_libretro_beetle_ngp
    build_libretro_beetle_pce_fast
+   build_libretro_beetle_supergrafx
    build_libretro_beetle_pcfx
    build_libretro_beetle_vb
    build_libretro_beetle_wswan
diff --git a/libretro-build-xdk1.sh b/libretro-build-xdk1.sh
index e0c94c41..807d3b00 100644
--- a/libretro-build-xdk1.sh
+++ b/libretro-build-xdk1.sh
@@ -82,6 +82,7 @@ else
    build_libretro_mednafen
    build_libretro_beetle_ngp
    build_libretro_beetle_pce_fast
+   build_libretro_beetle_supergrafx
    build_libretro_beetle_pcfx
    build_libretro_beetle_vb
    build_libretro_beetle_wswan
diff --git a/libretro-build-xdk360.sh b/libretro-build-xdk360.sh
index 73f76790..ae3fcd33 100644
--- a/libretro-build-xdk360.sh
+++ b/libretro-build-xdk360.sh
@@ -38,6 +38,7 @@ else
    build_libretro_mednafen
    build_libretro_beetle_ngp
    build_libretro_beetle_pce_fast
+   build_libretro_beetle_supergrafx
    build_libretro_beetle_pcfx
    build_libretro_beetle_vb
    build_libretro_beetle_wswan
diff --git a/libretro-build.sh b/libretro-build.sh
index 02f099cc..1c1329ee 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -99,6 +99,7 @@ else
    build_libretro_mednafen
    build_libretro_beetle_ngp
    build_libretro_beetle_pce_fast
+   build_libretro_beetle_supergrafx
    build_libretro_beetle_pcfx
    build_libretro_beetle_vb
    build_libretro_beetle_wswan
diff --git a/libretro-fetch.sh b/libretro-fetch.sh
index f1a7e00f..b8315381 100755
--- a/libretro-fetch.sh
+++ b/libretro-fetch.sh
@@ -95,12 +95,13 @@ fetch_project "$REPO_BASE/libretro/nestopia.git" "libretro-nestopia" "libretro/N
 fetch_project "$REPO_BASE/libretro/tyrquake.git" "libretro-tyrquake" "libretro/tyrquake"
 fetch_project "$REPO_BASE/libretro/pcsx_rearmed.git" "libretro-pcsx-rearmed" "libretro/pcsx_rearmed"
 fetch_project "$REPO_BASE/libretro/mednafen-libretro.git" "libretro-mednafen" "libretro/Mednafen"
-fetch_project "$REPO_BASE/libretro/beetle-ngp-libretro.git" "libretro-beetle-ngp" "libretro/Mednafen NGP"
-fetch_project "$REPO_BASE/libretro/beetle-pce-fast-libretro.git" "libretro-beetle-pce-fast" "libretro/Mednafen PCE Fast"
-fetch_project "$REPO_BASE/libretro/beetle-psx-libretro.git" "libretro-beetle-psx" "libretro/Mednafen PSX"
-fetch_project "$REPO_BASE/libretro/beetle-pcfx-libretro.git" "libretro-beetle-pcfx" "libretro/Mednafen PCFX"
-fetch_project "$REPO_BASE/libretro/beetle-vb-libretro.git" "libretro-beetle-vb" "libretro/Mednafen VB"
-fetch_project "$REPO_BASE/libretro/beetle-wswan-libretro.git" "libretro-beetle-wswan" "libretro/Mednafen WSwan"
+fetch_project "$REPO_BASE/libretro/beetle-ngp-libretro.git" "libretro-beetle-ngp" "libretro/Beetle NGP"
+fetch_project "$REPO_BASE/libretro/beetle-pce-fast-libretro.git" "libretro-beetle-pce-fast" "libretro/Beetle PCE Fast"
+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-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"
 fetch_project "$REPO_BASE/libretro/yabause.git" "libretro-yabause" "libretro/yabause"
 fetch_project "$REPO_BASE/libretro/dosbox-libretro.git" "libretro-dosbox" "libretro/dosbox"