diff --git a/libretro-build-android-mk.sh b/libretro-build-android-mk.sh
index f6bfaba0..8c97b5c8 100755
--- a/libretro-build-android-mk.sh
+++ b/libretro-build-android-mk.sh
@@ -37,28 +37,23 @@ die()
    #exit 1
 }
 
-build_libretro_mednafen()
+build_libretro_beetle_lynx()
 {
-   #TODO - refactor
    cd $BASE_DIR
    pwd
-   if [ -d "libretro-mednafen" ]; then
-      echo "=== Building Mednafen cores ==="
-      cd libretro-mednafen
+   if [ -d "libretro-beetle-lynx" ]; then
+      cd libretro-beetle-lynx
       cd jni
-      for core in lynx; do
-         echo "=== Building Mednafen ${core} ==="
-         if [ -z "${NOCLEAN}" ]; then
-            ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean mednafen_${core}"
-            ndk-build core=${core} clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean mednafen_${core}"
-         fi
-         ndk-build core=${core} APP_ABI="armeabi-v7a mips x86" || die "Failed to build mednafen_${core}"
-         cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/mednafen_${core}_libretro${FORMAT}.${FORMAT_EXT}
-         cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/mednafen_${core}_libretro${FORMAT}.${FORMAT_EXT}
-         cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/mednafen_${core}_libretro${FORMAT}.${FORMAT_EXT}
-      done
+      echo "=== Building Beetle Lynx ==="
+      if [ -z "${NOCLEAN}" ]; then
+         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Beetle Lynx"
+      fi
+      ndk-build APP_ABI="armeabi-v7a mips x86" || die "Failed to build Beetle Lynx"
+      cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/mednafen_lynx_libretro${FORMAT}.${FORMAT_EXT}
+      cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/mednafen_lynx_libretro${FORMAT}.${FORMAT_EXT}
+      cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/mednafen_lynx_libretro${FORMAT}.${FORMAT_EXT}
    else
-      echo "Mednafen not fetched, skipping ..."
+      echo "Beetle Lynx not fetched, skipping ..."
    fi
 }
 
@@ -777,6 +772,7 @@ if [ $1 ]; then
 else
    #build_libretro_bsnes_cplusplus98
    build_libretro_bsnes
+   #build_libretro_beetle_lynx
    build_libretro_beetle_gba
    build_libretro_beetle_ngp
    build_libretro_beetle_pce_fast
diff --git a/libretro-build-common-xdk.sh b/libretro-build-common-xdk.sh
index 9cf4cd86..1f090584 100644
--- a/libretro-build-common-xdk.sh
+++ b/libretro-build-common-xdk.sh
@@ -22,6 +22,20 @@ build_libretro_mednafen()
    done
 }
 
+build_libretro_beetle_lynx()
+{
+   cd $BASE_DIR
+   if [ -d "libretro-beetle-lynx" ]; then
+      echo "=== Building Beetle Lynx ==="
+      cd libretro-beetle-lynx
+      cd msvc
+      cmd.exe /k $MSVC_NAME.bat
+      cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/mednafen_lynx_libretro$FORMAT.$FORMAT_EXT
+   else
+      echo "Beetle Lynx not fetched, skipping ..."
+   fi
+}
+
 build_libretro_beetle_wswan()
 {
    cd $BASE_DIR
diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index 7aca15f0..73dfb5f6 100755
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -174,25 +174,23 @@ build_libretro_pcsx_rearmed_interpreter() {
    fi
 }
 
-build_libretro_mednafen() {
+build_libretro_beetle_lynx()
+{
    cd "${BASE_DIR}"
-   if [ -d 'libretro-mednafen' ]; then
-      echo '=== Building Mednafen ==='
-      cd libretro-mednafen
+   if [ -d 'libretro-beetle-lynx' ]; then
+      echo '=== Building Beetle Lynx ==='
+      cd libretro-beetle-lynx
 
-      for core in pcfx lynx gba; do
-         if [ -z "${NOCLEAN}" ]; then
-            "${MAKE}" core="${core}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die "Failed to clean mednafen/${core}"
-         fi
-         "${MAKE}" core="${core}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die "Failed to build mednafen/${core}"
-         cp "mednafen_${core//-/_}_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}"
-      done
+      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die "Failed to clean beetle/lynx"
+      "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die "Failed to build beetle/lynx"
+      cp "mednafen_lynx_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}"
    else
-      echo 'Mednafen not fetched, skipping ...'
+      echo 'Beetle Lynx not fetched, skipping ...'
    fi
 }
 
-build_libretro_beetle_wswan() {
+build_libretro_beetle_wswan()
+{
    cd "${BASE_DIR}"
    if [ -d 'libretro-beetle-wswan' ]; then
       echo '=== Building Beetle WSwan ==='
@@ -206,7 +204,8 @@ build_libretro_beetle_wswan() {
    fi
 }
 
-build_libretro_beetle_gba() {
+build_libretro_beetle_gba()
+{
    cd "${BASE_DIR}"
    if [ -d 'libretro-beetle-gba' ]; then
       echo '=== Building Beetle GBA ==='
@@ -220,7 +219,8 @@ build_libretro_beetle_gba() {
    fi
 }
 
-build_libretro_beetle_ngp() {
+build_libretro_beetle_ngp()
+{
    cd "${BASE_DIR}"
    if [ -d 'libretro-beetle-ngp' ]; then
       echo '=== Building Beetle NGP ==='
@@ -234,7 +234,8 @@ build_libretro_beetle_ngp() {
    fi
 }
 
-build_libretro_beetle_pce_fast() {
+build_libretro_beetle_pce_fast()
+{
    cd "${BASE_DIR}"
    if [ -d 'libretro-beetle-pce-fast' ]; then
       echo '=== Building Beetle PCE Fast ==='
@@ -248,7 +249,8 @@ build_libretro_beetle_pce_fast() {
    fi
 }
 
-build_libretro_beetle_supergrafx() {
+build_libretro_beetle_supergrafx()
+{
    cd "${BASE_DIR}"
    if [ -d 'libretro-beetle-supergrafx' ]; then
       echo '=== Building Beetle SuperGrafx ==='
@@ -262,7 +264,8 @@ build_libretro_beetle_supergrafx() {
    fi
 }
 
-build_libretro_beetle_vb() {
+build_libretro_beetle_vb()
+{
    cd "${BASE_DIR}"
    if [ -d 'libretro-beetle-vb' ]; then
       echo '=== Building Beetle VB ==='
@@ -276,7 +279,8 @@ build_libretro_beetle_vb() {
    fi
 }
 
-build_libretro_beetle_pcfx() {
+build_libretro_beetle_pcfx()
+{
    cd "${BASE_DIR}"
    if [ -d 'libretro-beetle-pcfx' ]; then
       echo '=== Building Beetle PCFX ==='
@@ -290,7 +294,8 @@ build_libretro_beetle_pcfx() {
    fi
 }
 
-build_libretro_beetle_psx() {
+build_libretro_beetle_psx()
+{
    cd "${BASE_DIR}"
    if [ -d 'libretro-beetle-psx' ]; then
       echo '=== Building Beetle PSX ==='
@@ -304,7 +309,8 @@ build_libretro_beetle_psx() {
    fi
 }
 
-build_libretro_beetle_snes() {
+build_libretro_beetle_snes()
+{
    cd "${BASE_DIR}"
    if [ -d 'libretro-mednafen' ]; then
       echo '=== Building Beetle bSNES ==='
diff --git a/libretro-build-ios.sh b/libretro-build-ios.sh
index 391b81a8..9ef7612b 100755
--- a/libretro-build-ios.sh
+++ b/libretro-build-ios.sh
@@ -29,6 +29,7 @@ if [ $1 ]; then
 else
    build_libretro_bsnes_cplusplus98
    build_libretro_bsnes
+   build_libretro_beetle_lynx
    build_libretro_beetle_gba
    build_libretro_beetle_ngp
    build_libretro_beetle_pce_fast
diff --git a/libretro-build-ngc.sh b/libretro-build-ngc.sh
index 2e16b0c5..5178d8f9 100755
--- a/libretro-build-ngc.sh
+++ b/libretro-build-ngc.sh
@@ -17,6 +17,7 @@ MAKE=make
 if [ $1 ]; then
    $1
 else
+   build_libretro_beetle_lynx
    build_libretro_beetle_gba
    build_libretro_beetle_ngp
    build_libretro_beetle_pce_fast
diff --git a/libretro-build-ps3.sh b/libretro-build-ps3.sh
index 3dc707d8..48808ebf 100755
--- a/libretro-build-ps3.sh
+++ b/libretro-build-ps3.sh
@@ -16,6 +16,7 @@ MAKE=make
 if [ $1 ]; then
    $1
 else
+   build_libretro_beetle_lynx
    build_libretro_beetle_gba
    build_libretro_beetle_ngp
    build_libretro_beetle_pce_fast
diff --git a/libretro-build-psp1.sh b/libretro-build-psp1.sh
index 1aac1219..bcda27c7 100755
--- a/libretro-build-psp1.sh
+++ b/libretro-build-psp1.sh
@@ -16,6 +16,7 @@ MAKE=make
 if [ $1 ]; then
    $1
 else
+   build_libretro_beetle_lynx
    build_libretro_beetle_gba
    build_libretro_beetle_ngp
    build_libretro_beetle_pce_fast
diff --git a/libretro-build-qnx.sh b/libretro-build-qnx.sh
index b291c877..e685c002 100755
--- a/libretro-build-qnx.sh
+++ b/libretro-build-qnx.sh
@@ -18,6 +18,7 @@ if [ $1 ]; then
 else
    build_libretro_bsnes_cplusplus98
    #build_libretro_bsnes
+   build_libretro_beetle_lynx
    build_libretro_beetle_gba
    build_libretro_beetle_pce_fast
    build_libretro_beetle_supergrafx
diff --git a/libretro-build-wii.sh b/libretro-build-wii.sh
index b842b4ed..5119dea7 100755
--- a/libretro-build-wii.sh
+++ b/libretro-build-wii.sh
@@ -17,7 +17,7 @@ MAKE=make
 if [ $1 ]; then
    $1
 else
-   build_libretro_mednafen
+   build_libretro_beetle_lynx
    build_libretro_beetle_gba
    build_libretro_beetle_ngp
    build_libretro_beetle_pce_fast
diff --git a/libretro-build-win.sh b/libretro-build-win.sh
index d652032a..1afa9c20 100644
--- a/libretro-build-win.sh
+++ b/libretro-build-win.sh
@@ -20,7 +20,7 @@ source $BASE_DIR/libretro-build-common-xdk.sh
 if [ $1 ]; then
    $1
 else
-   build_libretro_mednafen
+   #build_libretro_beetle_lynx
    build_libretro_beetle_gba
    build_libretro_beetle_ngp
    build_libretro_beetle_pce_fast
diff --git a/libretro-build-xdk1.sh b/libretro-build-xdk1.sh
index 9c804097..65d7781e 100644
--- a/libretro-build-xdk1.sh
+++ b/libretro-build-xdk1.sh
@@ -79,6 +79,7 @@ source $BASE_DIR/libretro-build-common-xdk.sh
 if [ $1 ]; then
    $1
 else
+   #build_libretro_beetle_lynx
    build_libretro_beetle_gba
    build_libretro_beetle_ngp
    build_libretro_beetle_pce_fast
diff --git a/libretro-build-xdk360.sh b/libretro-build-xdk360.sh
index fdd325f5..0f1c3e1c 100644
--- a/libretro-build-xdk360.sh
+++ b/libretro-build-xdk360.sh
@@ -35,6 +35,7 @@ source $BASE_DIR/libretro-build-common-xdk.sh
 if [ $1 ]; then
    $1
 else
+   #build_libretro_beetle_lynx
    build_libretro_beetle_gba
    build_libretro_beetle_ngp
    build_libretro_beetle_pce_fast
diff --git a/libretro-build.sh b/libretro-build.sh
index 705367c9..fb9303a7 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -96,6 +96,7 @@ if [ $1 ]; then
 else
    build_libretro_bsnes_cplusplus98
    build_libretro_bsnes
+   build_libretro_beetle_lynx
    build_libretro_beetle_gba
    build_libretro_beetle_ngp
    build_libretro_beetle_pce_fast
diff --git a/libretro-fetch.sh b/libretro-fetch.sh
index 407883e0..01818c61 100755
--- a/libretro-fetch.sh
+++ b/libretro-fetch.sh
@@ -96,6 +96,7 @@ fetch_project "$REPO_BASE/libretro/tyrquake.git" "libretro-tyrquake" "libretro/t
 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-gba-libretro.git" "libretro-beetle-gba" "libretro/Beetle GBA"
+fetch_project "$REPO_BASE/libretro/beetle-lynx-libretro.git" "libretro-beetle-lynx" "libretro/Beetle Lynx"
 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"