diff --git a/libretro-build-ngc.sh b/libretro-build-ngc.sh
index d466d536..ab608fd0 100755
--- a/libretro-build-ngc.sh
+++ b/libretro-build-ngc.sh
@@ -14,43 +14,39 @@ else
 	fi
 fi
 
-RARCH_DIR=$BASE_DIR/dist
-RARCH_DIST_DIR=$RARCH_DIR/ngc
-FORMAT=_ngc
-FORMAT_COMPILER_TARGET=ngc
-FORMAT_COMPILER_TARGET_ALT=ngc
-FORMAT_EXT=a
-JOBS=7
-MAKE=make
+# The NGC build rules have all been moved to libretro-build.sh
 
-. "$BASE_DIR/libretro-build-common-gx.sh"
-. "$BASE_DIR/libretro-build-common.sh"
-
-if [ $1 ]; then
-	$1
+if [[ -z "$1" ]]; then
+WANT_CORES=" \
+	2048 \
+	bluemsx \
+	fceumm  \
+	fmsx \
+	gambatte \
+	genesis_plus_gx \
+	mednafen_gba \
+	mednafen_lynx \
+	mednafen_ngp \
+	mednafen_pce_fast \
+	mednafen_pcfx \
+	mednafen_supergrafx \
+	mednafen_wswan \
+	mednafen_vb \
+	nestopia \
+	nxengine \
+	quicknes \
+	prboom \
+	snes9x_next \
+	vba_next \
+	tyrquake \
+	gw \
+	mgba \
+	fb_alpha_cps1 \
+	fb_alpha_cps2 \
+	fb_alpha_neo \
+	vecx"
 else
-	libretro_build_core bluemsx
-	libretro_build_core fceumm
-	libretro_build_core fmsx
-	libretro_build_core gambatte
-	libretro_build_core genesis_plus_gx
-	libretro_build_core mednafen_bsnes
-	libretro_build_core mednafen_gba
-	libretro_build_core mednafen_lynx
-	libretro_build_core mednafen_ngp
-	libretro_build_core mednafen_pce_fast
-	libretro_build_core mednafen_pcfx
-	libretro_build_core mednafen_supergrafx
-	libretro_build_core mednafen_vb
-	libretro_build_core mednafen_wswan
-	libretro_build_core nestopia
-	libretro_build_core nxengine
-	libretro_build_core prboom
-	libretro_build_core quicknes
-	libretro_build_core snes9x_next
-	libretro_build_core tyrquake
-	libretro_build_core vba_next
-	#libretro_build_core yabause
-
-	build_libretro_fba # not in libretro-build-common!
+WANT_CORES="$@"
 fi
+
+platform=ngc ${BASE_DIR}/libretro-build.sh ${WANT_CORES}
diff --git a/libretro-config.sh b/libretro-config.sh
index 1b9f1607..b7fa140d 100755
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -57,11 +57,23 @@ case "$platform" in
 		CC="ppu-lv2-gcc.exe"
 		CXX="ppu-lv2-g++.exe"
 		;;
+
+	ngc)
+		DIST_DIR="ngc"
+		FORMAT_EXT=a
+		FORMAT_COMPILER_TARGET=ngc
+		FORMAT_COMPILER_TARGET_ALT=ngc
+		FORMAT=_ngc
+
+		CC="$DEVKITPPC/bin/powerpc-eabi-gcc$BINARY_EXT"
+		CXX="$DEVKITPPC/bin/powerpc-eabi-g++$BINARY_EXT"
+		;;
 	
 	wii)
 		DIST_DIR="wii"
 		FORMAT_EXT=a
 		FORMAT_COMPILER_TARGET=wii
+		FORMAT_COMPILER_TARGET_ALT=wii
 		FORMAT=_wii
 
 		CC="$DEVKITPPC/bin/powerpc-eabi-gcc$BINARY_EXT"