diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index 6f400b9c..ce1e7704 100755
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -40,6 +40,20 @@ check_opengl() {
    fi
 }
 
+build_libretro_bsnes_cplusplus98() {
+   cd "${BASE_DIR}"
+   if [ -d 'libretro-bsnes-cplusplus98' ]; then
+      echo '=== Building bSNES C++98 ==='
+      cd libretro-bsnes-cplusplus98
+
+      "${MAKE}" clean || die 'Failed to clean bSNES C++98'
+      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}"
+      cp "out/libretro.${FORMAT_EXT}" "${RARCH_DIST_DIR}/bsnes_cplusplus98.${FORMAT_EXT}"
+   else
+      echo 'bSNES C++98 not fetched, skipping ...'
+   fi
+}
+
 build_libretro_ffmpeg() {
    cd "${BASE_DIR}"
    if [ -d 'libretro-ffmpeg' ]; then
diff --git a/libretro-build.sh b/libretro-build.sh
index be2ddf38..26e3eb26 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -89,6 +89,7 @@ mkdir -p "$RARCH_DIST_DIR"
 if [ $1 ]; then
    $1
 else
+   build_libretro_bsnes_cplusplus98
    build_libretro_bsnes
    build_libretro_mednafen
    build_libretro_mednafen_gba