diff --git a/sc2/build/unix_installer/buildinstaller.sh b/sc2/build/unix_installer/buildinstaller.sh
index b57525307..433eb2fe4 100755
--- a/sc2/build/unix_installer/buildinstaller.sh
+++ b/sc2/build/unix_installer/buildinstaller.sh
@@ -64,11 +64,13 @@ EOF
 	for PACKAGE in $UQM_PACKAGES; do
 		eval PACKAGE_NAME="\$UQM_PACKAGE_${PACKAGE}_NAME"
 		eval PACKAGE_TITLE="\$UQM_PACKAGE_${PACKAGE}_TITLE"
+		eval PACKAGE_LOCATION="\$UQM_PACKAGE_${PACKAGE}_LOCATION"
 		eval PACKAGE_OPTIONAL="\$UQM_PACKAGE_${PACKAGE}_OPTIONAL"
 		eval PACKAGE_DEFAULT="\$UQM_PACKAGE_${PACKAGE}_DEFAULT"
 		cat << EOF
 UQM_PACKAGE_${PACKAGE}_NAME="$PACKAGE_NAME"
 UQM_PACKAGE_${PACKAGE}_TITLE="$PACKAGE_TITLE"
+UQM_PACKAGE_${PACKAGE}_LOCATION="$PACKAGE_LOCATION"
 UQM_PACKAGE_${PACKAGE}_OPTIONAL="$PACKAGE_OPTIONAL"
 UQM_PACKAGE_${PACKAGE}_DEFAULT="$PACKAGE_DEFAULT"
 EOF
diff --git a/sc2/build/unix_installer/install.sh.in b/sc2/build/unix_installer/install.sh.in
index 652885d13..9ac8ab48c 100644
--- a/sc2/build/unix_installer/install.sh.in
+++ b/sc2/build/unix_installer/install.sh.in
@@ -237,13 +237,15 @@ mkdir -p -- "$PREFIX"/lib/uqm 2> /dev/null
 mkdir -p -- "$PREFIX"/bin 2> /dev/null
 
 echo "Unpacking packages..."
-for COMPFILE in `selected_components`; do
+for PACKAGE in `selected_packages`; do
 	echo "- $COMPFILE"
-	unzip -od "$PREFIX" "$COMPFILE"
+	COMPFILE="$(package_filename $PACKAGE)"
+	eval LOCATION="\$UQM_PACKAGE_${PACKAGE}_LOCATION"
+	unzip -od "${PREFIX}${LOCATION}" "$COMPFILE"
 done
 
 echo "Unpacking other stuff..."
-tail -c @ATTACHLEN@ < "$0" | gzip -dc | tar -xf - -C "$PREFIX"/
+tail -c @ATTACHLEN@ < "$0" | gzip -dc | tar -xf - -C "$PREFIX"
 
 echo "Creating wrapper script..."
 cat << EOF > "$PREFIX"bin/uqm
diff --git a/sc2/build/unix_installer/installer.config b/sc2/build/unix_installer/installer.config
index 2d5a77388..899bb0e57 100644
--- a/sc2/build/unix_installer/installer.config
+++ b/sc2/build/unix_installer/installer.config
@@ -124,13 +124,13 @@ show_content_path_menu() {
 	INPUT_content_path_VALUE="${INPUT_content_path_VALUE%/}/"
 }
 
-selected_components() {
+selected_packages() {
 	local RESULT PACKAGE VALUE
 	RESULT=""
 	for PACKAGE in $UQM_PACKAGES; do
 		eval VALUE="\$CHECK_${PACKAGE}_VALUE"
 		if [ "$VALUE" = CHECKED ]; then
-			RESULT="${RESULT:+$RESULT }$(package_filename $PACKAGE)"
+			RESULT="${RESULT:+$RESULT }$PACKAGE"
 		fi
 	done
 	echo "$RESULT"
diff --git a/sc2/build/unix_installer/template b/sc2/build/unix_installer/template
index d08fe0029..71a4a4fbe 100644
--- a/sc2/build/unix_installer/template
+++ b/sc2/build/unix_installer/template
@@ -7,14 +7,17 @@ UQM_LICENSE_FILE="COPYING"
 UQM_PACKAGES="content voice 3domusic"
 UQM_PACKAGE_content_NAME="content"
 UQM_PACKAGE_content_TITLE="General game data"
+UQM_PACKAGE_content_LOCATION="lib/uqm/content/"
 UQM_PACKAGE_content_OPTIONAL="FALSE"
 UQM_PACKAGE_content_DEFAULT="TRUE"
 UQM_PACKAGE_voice_NAME="voice"
 UQM_PACKAGE_voice_TITLE="Spoken alien communication"
+UQM_PACKAGE_voice_LOCATION="lib/uqm/content/"
 UQM_PACKAGE_voice_OPTIONAL="TRUE"
 UQM_PACKAGE_voice_DEFAULT="TRUE"
 UQM_PACKAGE_3domusic_NAME="3domusic"
 UQM_PACKAGE_3domusic_TITLE="Music from the 3DO version"
+UQM_PACKAGE_3domusic_LOCATION="lib/uqm/content/"
 UQM_PACKAGE_3domusic_OPTIONAL="TRUE"
 UQM_PACKAGE_3domusic_DEFAULT="TRUE"