diff --git a/sc2/build/unix/build.config b/sc2/build/unix/build.config
index 159feb7b8..a116aeed7 100644
--- a/sc2/build/unix/build.config
+++ b/sc2/build/unix/build.config
@@ -230,12 +230,12 @@ uqm_process_config() {
 
 uqm_load_config()
 {
-	menu_load MENU main "$BUILD_WORK/config.state"
+	do_menu_load MENU main "$BUILD_WORK/config.state"
 }
 
 uqm_save_config()
 {
-	menu_save MENU main "$BUILD_WORK/config.state"
+	do_menu_save MENU main "$BUILD_WORK/config.state"
 }
 
 uqm_pre_build() {
diff --git a/sc2/build/unix/build_functions b/sc2/build/unix/build_functions
index 609fd1b2e..bae60af87 100644
--- a/sc2/build/unix/build_functions
+++ b/sc2/build/unix/build_functions
@@ -124,7 +124,9 @@ build_config() {
 	config_requirements
 	eval "${TARGET}_requirements"
 	eval "${TARGET}_prepare_config"
+	eval "${TARGET}_load_config"
 	eval "${TARGET}_do_config"
+	eval "${TARGET}_save_config"
 }
 
 build_reconfig() {
@@ -133,6 +135,7 @@ build_reconfig() {
 	fi
 	config_requirements
 	eval "${TARGET}_requirements"
+	eval "${TARGET}_load_config"
 	build_process_config
 	echo "Reconfiguring complete..." 1>&2
 }
diff --git a/sc2/build/unix/menu_functions b/sc2/build/unix/menu_functions
index 0a472d636..37c27e349 100644
--- a/sc2/build/unix/menu_functions
+++ b/sc2/build/unix/menu_functions
@@ -620,7 +620,7 @@ do_menu() {
 #              $3 - the name of the file to load from
 # Returns:     0 - if the file was loaded successfully
 #              1 - if the file did not exist
-menu_load() {
+do_menu_load() {
 	SAVE_FILE=$3
 
 	if [ ! -e "$SAVE_FILE" ]; then
@@ -636,7 +636,7 @@ menu_load() {
 #              $2 - the name of the menu
 #              $3 - the name of the file to save to
 # Returns:     0 - if the file was saved successfully
-menu_save() {
+do_menu_save() {
 	MENU_TYPE=$1
 	START_MENU=$2
 	SAVE_FILE=$3