diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index 588d339c..4accae77 100755
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -211,19 +211,19 @@ build_makefile() {
 	if [ -d "$build_dir" ]; then
 		echo_cmd "cd \"$build_dir\""
 
-		$core_build_prebuild
+		$core_build_configure
 
 		if [ -z "$NOCLEAN" ]; then
 			$core_build_preclean
 			echo_cmd "$make_cmdline $core_build_args clean"
-			$core_build_postclean
 		fi
 		make_cmdline="$make_cmdline $COMPILER"
 
+		$core_build_prebuild
 		echo_cmd "$make_cmdline $core_build_args"
-		$core_build_postbuild
 
-		# TODO: Make this a separate stage rule
+		# TODO: Make this a separate stage/package rule
+		$core_build_prepkg
 		for a in $core_build_cores; do
 			copy_core_to_dist ${core_build_products:+$core_build_products/}$a $a
 		done
@@ -272,10 +272,10 @@ libretro_build_core() {
 
 	case "$core_build_rule" in
 		generic_makefile)
+			core_build_configure="libretro_${1}_build_configure"
 			core_build_preclean="libretro_${1}_build_preclean"
-			core_build_postclean="libretro_${1}_build_preclean"
-			core_build_prebuild="libretro_${1}_build_postbuild"
-			core_build_postbuild="libretro_${1}_build_postbuild"
+			core_build_prebuild="libretro_${1}_build_prebuild"
+			core_build_prepkg="libretro_${1}_build_prepkg"
 			eval "core_build_makefile=\$libretro_${1}_build_makefile"
 			eval "core_build_subdir=\$libretro_${1}_build_subdir"
 			eval "core_build_args=\$libretro_${1}_build_args"