diff --git a/sc2/build.vars.in b/sc2/build.vars.in
index 93c5c42dc..e6706aad4 100644
--- a/sc2/build.vars.in
+++ b/sc2/build.vars.in
@@ -15,6 +15,8 @@
 # along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+BUILD_SYSTEM='@BUILD_SYSTEM@'
+HOST_SYSTEM='@HOST_SYSTEM@'
 COMPILE=gcc
 MKDEPEND='gcc -MM'
 MAKE='@MAKE@'
diff --git a/sc2/build/unix/build.config b/sc2/build/unix/build.config
index 60f3e3f98..c607d3dda 100644
--- a/sc2/build/unix/build.config
+++ b/sc2/build/unix/build.config
@@ -242,7 +242,8 @@ uqm_process_config() {
 	substitute_vars SUBSTITUTE_VARS SUBSTITUTE_FILES src "$BUILD_WORK"
 
 	# Make build.vars from build.vars.in, substituting variables.
-	SUBSTITUTE_VARS="CFLAGS LDFLAGS MAKE ECHON DEBUG SED SOUNDMODULE \
+	SUBSTITUTE_VARS="BUILD_SYSTEM HOST_SYSTEM CFLAGS LDFLAGS MAKE \
+			ECHON DEBUG SED SOUNDMODULE \
 			HAVE_OPENGL HAVE_REGEX_H_FLAG USE_ZIP_IO \
 			INSTALL_LIBDIR INSTALL_BINDIR INSTALL_SHAREDIR \
 			REZ WINDRES"
@@ -314,7 +315,7 @@ uqm_post_install() {
 }
 
 uqm_install_osx() {
-	local VERSION HEADERS HEADER FRAMEWORK
+	local VERSION HEADERS HEADER HEADER_FILE FRAMEWORK
 
 	VERSION=`head -1 content/version`
 
@@ -340,10 +341,10 @@ uqm_install_osx() {
 		HEADERS="$HEADERS OpenAL/al.h"
 	fi
 	for HEADER in $HEADERS; do
-		HEADER=`basename $HEADER`
+		HEADER_FILE=`basename $HEADER`
 		eval FRAMEWORK=`echo '' | \
 				$COMPILE -E -D__MACOSX__ -include $HEADER - | \
-				awk '(/'$HEADER'/ && $2 == 1) { print $3; exit }' | \
+				awk '(/'$HEADER_FILE'/ && $2 == 1) { print $3; exit }' | \
 				$SED 's/.Headers.*$/"/'`
 		cp -r "$FRAMEWORK" "$INSTROOT/Frameworks"
 	done
@@ -351,7 +352,7 @@ uqm_install_osx() {
 	# Install game content (it should probably make a zipfile)
 	cp content/starcon.key content/version "$INSTROOT/Resources/content"
 	(cd content && \
-			find .\( -name CVS -o -name packages \) -prune -o \
+			find . \( -name CVS -o -name packages \) -prune -o \
 			\! \( -type d -o -name packages -o -name CVS -o \
 			-name starcon.key -o -name version -o -name \*.ogg \) \
 			-print | $SED 's/^..//' | zip -@ uqm-${VERSION}-prv-content.uqm)