diff --git a/libretro-build-ngc.sh b/libretro-build-ngc.sh
index 4f07167e..c263330f 100755
--- a/libretro-build-ngc.sh
+++ b/libretro-build-ngc.sh
@@ -95,19 +95,26 @@ build_libretro_fba()
       make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean Final Burn Alpha"
       make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build Final Burn Alpha"
       cp fb_alpha_libretro$FORMAT.a $RARCH_DIST_DIR
+
+      echo "=== Building Final Burn Alpha Cores (CPS1) ==="
+      cd fbacores/cps1
+      make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean Final Burn Alpha Cores CPS1"
+      make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build Final Burn Alpha Cores CPS1"
+      cp fb_alpha_libretro$FORMAT.a $RARCH_DIST_DIR/fba_cores_cps1_libretro$FORMAT.a
+      cd ../../
       
       echo "=== Building Final Burn Alpha Cores (CPS2) ==="
       cd fbacores/cps2
       make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean Final Burn Alpha Cores CPS2"
       make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build Final Burn Alpha Cores CPS2"
-      cp libretro_ngc.a $RARCH_DIST_DIR/fba_cores_cps2_libretro$FORMAT.a
+      cp libretro$FORMAT.a $RARCH_DIST_DIR/fba_cores_cps2_libretro$FORMAT.a
       cd ../../
 
       echo "=== Building Final Burn Alpha Cores (NeoGeo) ==="
       cd fbacores/neogeo
       make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean Final Burn Alpha Cores NeoGeo"
       make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build Final Burn Alpha Cores NeoGeo"
-      cp libretro_ngc.a $RARCH_DIST_DIR/fba_cores_neo_libretro$FORMAT.a
+      cp libretro$FORMAT.a $RARCH_DIST_DIR/fba_cores_neo_libretro$FORMAT.a
    else
       echo "Final Burn Alpha not fetched, skipping ..."
    fi
diff --git a/libretro-build-wii.sh b/libretro-build-wii.sh
index 407d4897..d4e8c637 100755
--- a/libretro-build-wii.sh
+++ b/libretro-build-wii.sh
@@ -95,19 +95,26 @@ build_libretro_fba()
       make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean Final Burn Alpha"
       make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build Final Burn Alpha"
       cp fb_alpha_libretro$FORMAT.a $RARCH_DIST_DIR
+
+      echo "=== Building Final Burn Alpha Cores (CPS1) ==="
+      cd fbacores/cps1
+      make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean Final Burn Alpha Cores CPS1"
+      make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build Final Burn Alpha Cores CPS1"
+      cp fb_alpha_libretro$FORMAT.a $RARCH_DIST_DIR/fba_cores_cps1_libretro$FORMAT.a
+      cd ../../
       
       echo "=== Building Final Burn Alpha Cores (CPS2) ==="
       cd fbacores/cps2
       make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean Final Burn Alpha Cores CPS2"
       make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build Final Burn Alpha Cores CPS2"
-      cp libretro_wii.a $RARCH_DIST_DIR/fba_cores_cps2_libretro$FORMAT.a
+      cp libretro$FORMAT.a $RARCH_DIST_DIR/fba_cores_cps2_libretro$FORMAT.a
       cd ../../
 
       echo "=== Building Final Burn Alpha Cores (NeoGeo) ==="
       cd fbacores/neogeo
       make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean Final Burn Alpha Cores NeoGeo"
       make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build Final Burn Alpha Cores NeoGeo"
-      cp libretro_wii.a $RARCH_DIST_DIR/fba_cores_neo_libretro$FORMAT.a
+      cp libretro$FORMAT.a $RARCH_DIST_DIR/fba_cores_neo_libretro$FORMAT.a
    else
       echo "Final Burn Alpha not fetched, skipping ..."
    fi