diff --git a/libretro-build-android-mk.sh b/libretro-build-android-mk.sh
index 48004248..b66c9e4b 100755
--- a/libretro-build-android-mk.sh
+++ b/libretro-build-android-mk.sh
@@ -38,26 +38,6 @@ die()
    #exit 1
 }
 
-build_libretro_fba_full()
-{
-   CORENAME="fba"
-   cd $BASE_DIR
-   if [ -d "libretro-${CORENAME}" ]; then
-      echo "=== Building ${CORENAME} ==="
-      cd libretro-${CORENAME}
-      cd svn-current/trunk
-      cd projectfiles/libretro-android/jni
-      for a in "${ABIS[@]}"; do
-         if [ -z "${NOCLEAN}" ]; then
-            ndk-build clean APP_ABI=${a} || die "Failed to clean ${a} ${CORENAME}"
-         fi
-         ndk-build -j$JOBS APP_ABI=${a} || die "Failed to build  ${a} ${CORENAME}"
-         cp ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/fb_alpha_libretro${FORMAT}.${FORMAT_EXT}
-      done
-   else
-      echo "${CORENAME} not fetched, skipping ..."
-   fi
-}
 
 
 # $1 is core name
@@ -209,11 +189,13 @@ build_libretro_dinothawr() {
    build_libretro_generic_makefile "dinothawr" "android/eclipse/jni"
 }
 
-build_libretro_desmume()
-{
+build_libretro_desmume() {
    build_libretro_generic_makefile "desmume" "desmume/src/libretro/jni"
 }
 
+build_libretro_fb_alpha() {
+   build_libretro_generic_makefile "fb_alpha" "svn-current/trunk/projectfiles/libretro-android/jni"
+}
 
 create_dist_dir()
 {
@@ -282,7 +264,7 @@ else
    build_libretro_snes9x
    build_libretro_snes9x_next
    build_libretro_genesis_plus_gx
-   build_libretro_fba_full
+   build_libretro_fb_alpha
    build_libretro_vbam
    build_libretro_vba_next
    #build_libretro_bnes
diff --git a/libretro-build-common-gx.sh b/libretro-build-common-gx.sh
index 4e9007c6..3d0cf7f8 100644
--- a/libretro-build-common-gx.sh
+++ b/libretro-build-common-gx.sh
@@ -16,7 +16,7 @@ build_libretro_fba_cps2_gx()
 
 build_libretro_fba()
 {
-   build_libretro_fba_full
+   build_libretro_fb_alpha
    build_libretro_fba_cps1
    build_libretro_fba_cps2_gx
    build_libretro_fba_neogeo
diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index cbeeaa40..70e12c04 100755
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -43,22 +43,6 @@ check_opengl() {
 
 
 
-build_libretro_fba_full() {
-   cd "${BASE_DIR}"
-   if [ -d 'libretro-fba' ]; then
-		echo '=== Building Final Burn Alpha (Full) ==='
-      cd libretro-fba/
-      cd svn-current/trunk
-
-      if [ -z "${NOCLEAN}" ]; then
-         "${MAKE}" -f makefile.libretro platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die 'Failed to clean Final Burn Alpha'
-      fi
-      "${MAKE}" -f makefile.libretro platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die 'Failed to build Final Burn Alpha'
-      cp "fb_alpha_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}"
-   else
-      echo 'Final Burn Alpha not fetched, skipping ...'
-   fi
-}
 
 build_libretro_fba_cps1()
 {
@@ -310,6 +294,10 @@ build_libretro_dosbox() {
    build_libretro_generic_makefile "dosbox" "." "Makefile.libretro" ${FORMAT_COMPILER_TARGET}
 }
 
+build_libretro_fb_alpha() {
+   build_libretro_generic_makefile "fb_alpha" "svn-current/trunk" "makefile.libretro" ${FORMAT_COMPILER_TARGET}
+}
+
 build_libretro_ffmpeg() {
    check_opengl
    build_libretro_generic_makefile "ffmpeg" "libretro" "Makefile" ${FORMAT_COMPILER_TARGET}
diff --git a/libretro-build-ios.sh b/libretro-build-ios.sh
index a968a5ce..8360344f 100755
--- a/libretro-build-ios.sh
+++ b/libretro-build-ios.sh
@@ -45,7 +45,7 @@ else
    build_libretro_snes9x
    build_libretro_snes9x_next
    build_libretro_genesis_plus_gx
-   build_libretro_fba_full
+   build_libretro_fb_alpha
    build_libretro_vbam
    build_libretro_vba_next
    build_libretro_fceumm
diff --git a/libretro-build-ps3.sh b/libretro-build-ps3.sh
index c666b428..269ee54c 100755
--- a/libretro-build-ps3.sh
+++ b/libretro-build-ps3.sh
@@ -28,7 +28,7 @@ else
    build_libretro_beetle_bsnes
    build_libretro_snes9x_next
    build_libretro_genesis_plus_gx
-   build_libretro_fba_full
+   build_libretro_fb_alpha
    build_libretro_vba_next
    build_libretro_fceumm
    build_libretro_gambatte
diff --git a/libretro-build-qnx.sh b/libretro-build-qnx.sh
index 1fdb608c..290069b6 100755
--- a/libretro-build-qnx.sh
+++ b/libretro-build-qnx.sh
@@ -33,7 +33,7 @@ else
    build_libretro_snes9x
    build_libretro_snes9x_next
    build_libretro_genesis_plus_gx
-   build_libretro_fba_full
+   build_libretro_fb_alpha
    build_libretro_vbam
    build_libretro_vba_next
    #build_libretro_bnes
diff --git a/libretro-build-win.sh b/libretro-build-win.sh
index 43d0cc9f..012e3106 100644
--- a/libretro-build-win.sh
+++ b/libretro-build-win.sh
@@ -32,7 +32,7 @@ else
    build_libretro_snes9x
    build_libretro_snes9x_next
    build_libretro_genesis_plus_gx
-   #build_libretro_fba
+   #build_libretro_fb_alpha
    build_libretro_vba_next
    build_libretro_fceumm
    build_libretro_gambatte
diff --git a/libretro-build-xdk360.sh b/libretro-build-xdk360.sh
index 1e9c78a9..ef6b71bd 100644
--- a/libretro-build-xdk360.sh
+++ b/libretro-build-xdk360.sh
@@ -46,7 +46,7 @@ else
    #build_libretro_beetle_bsnes
    build_libretro_snes9x_next
    build_libretro_genesis_plus_gx
-   build_libretro_fba
+   build_libretro_fb_alpha
    build_libretro_vba_next
    build_libretro_fceumm
    build_libretro_gambatte
diff --git a/libretro-build.sh b/libretro-build.sh
index bca9a8f8..09d94c2d 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -113,7 +113,7 @@ else
    build_libretro_snes9x
    build_libretro_snes9x_next
    build_libretro_genesis_plus_gx
-   build_libretro_fba_full
+   build_libretro_fb_alpha
    build_libretro_vbam
    build_libretro_vba_next
    build_libretro_bnes
diff --git a/libretro-fetch.sh b/libretro-fetch.sh
index 19c6640b..4476ee6b 100755
--- a/libretro-fetch.sh
+++ b/libretro-fetch.sh
@@ -113,7 +113,7 @@ fetch_project_bsnes "git://gitorious.org/bsnes/bsnes.git --branch libretro" "lib
 fetch_project "$REPO_BASE/libretro/snes9x.git" "libretro-snes9x" "libretro/SNES9x"
 fetch_project "$REPO_BASE/libretro/snes9x-next.git" "libretro-snes9x_next" "libretro/SNES9x-Next"
 fetch_project "$REPO_BASE/libretro/Genesis-Plus-GX.git" "libretro-genesis_plus_gx" "libretro/Genplus GX"
-fetch_project "$REPO_BASE/libretro/fba-libretro.git" "libretro-fba" "libretro/FBA"
+fetch_project "$REPO_BASE/libretro/fba-libretro.git" "libretro-fb_alpha" "libretro/FBA"
 fetch_project "$REPO_BASE/libretro/vba-next.git" "libretro-vba_next" "libretro/VBA Next"
 fetch_project "$REPO_BASE/libretro/vbam-libretro.git" "libretro-vbam" "libretro/VBA-M"
 fetch_project "$REPO_BASE/libretro/libretro-handy.git" "libretro-handy" "libretro/Handy"