diff --git a/sc2/build/unix_installer/install.sh.in b/sc2/build/unix_installer/install.sh.in
index d9df5b963..d89ba0397 100644
--- a/sc2/build/unix_installer/install.sh.in
+++ b/sc2/build/unix_installer/install.sh.in
@@ -77,7 +77,7 @@ cat << EOF
 Now I need somewhere to put all those Ur-Quan Masters files.
 My invisible friend tells me $INPUT_install_prefix_DEFAULT is a good place.
 I would put an executable there in a bin/ dir and a lot of junk together
-in a subdir under lib/
+in a subdir under share/ and a little bit in a subdir under lib/
 But you're the boss, so where shall I put them?"
 EOF
 while :; do
@@ -148,9 +148,9 @@ $PREFIX it is. I can work with that.
 
 EOF
 
-if [ -d "${PREFIX}/lib/uqm/content" ]; then
-	if [ -f "${PREFIX}/lib/uqm/content/version" ]; then
-		read UQM_OLDVERSION < "${PREFIX}/lib/uqm/content/version"
+if [ -d "${PREFIX}/share/uqm/content" ]; then
+	if [ -f "${PREFIX}/share/uqm/content/version" ]; then
+		read UQM_OLDVERSION < "${PREFIX}/share/uqm/content/version"
 	else
 		UQM_OLDVERSION=0.1
 	fi
@@ -235,7 +235,7 @@ echo "A word as good as any."
 echo
 
 echo "Making directories..."
-mkdir -p -- "$PREFIX"/lib/uqm/content 2> /dev/null
+mkdir -p -- "$PREFIX"/share/uqm/content 2> /dev/null
 mkdir -p -- "$PREFIX"/bin 2> /dev/null
 
 echo "Unpacking packages..."
@@ -259,7 +259,7 @@ echo "Creating wrapper script..."
 cat << EOF > "$PREFIX"bin/uqm
 #!/bin/sh
 # Wrapper script for starting The Ur-Quan Masters
-"${PREFIX}lib/uqm/uqm" "--contentdir=${PREFIX}lib/uqm/content" "\$@"
+"${PREFIX}lib/uqm/uqm" "--contentdir=${PREFIX}share/uqm/content" "\$@"
 EOF
 chmod 755 "$PREFIX"bin/uqm
 
@@ -268,7 +268,7 @@ cat << EOF
 All done. Now you can play The Ur-Quan masters.
 I told you I was going to make you very happy.
 And if you're looking for documentation, you can find some in
-${PREFIX}lib/uqm/doc/. If you aren't looking for documentation, too.
+${PREFIX}share/uqm/doc/. If you aren't looking for documentation, too.
 But feel free to delete them. You know where to find them.
 EOF
 
diff --git a/sc2/build/unix_installer/installer.config b/sc2/build/unix_installer/installer.config
index 899bb0e57..aeb9a03f6 100644
--- a/sc2/build/unix_installer/installer.config
+++ b/sc2/build/unix_installer/installer.config
@@ -101,8 +101,8 @@ show_components_menu() {
 INPUT_install_prefix_TITLE="Installation prefix"
 #INPUT_install_prefix_TEXT=\
 #"  This is the top directory where the game data will be installed.
-#  In the directory you specify directories like 'lib' and 'bin' will
-#  be used.
+#  In the directory you specify directories like 'bin', 'lib' and 'share'
+#  will be used.
 #"
 if [ "$(id -u)" -eq 0 ]; then
 	INPUT_install_prefix_DEFAULT="/usr/local/games/"
diff --git a/sc2/build/unix_installer/template b/sc2/build/unix_installer/template
index 71a4a4fbe..c2664bae1 100644
--- a/sc2/build/unix_installer/template
+++ b/sc2/build/unix_installer/template
@@ -7,17 +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_LOCATION="share/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_LOCATION="share/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_LOCATION="share/uqm/content/"
 UQM_PACKAGE_3domusic_OPTIONAL="TRUE"
 UQM_PACKAGE_3domusic_DEFAULT="TRUE"
 
@@ -30,11 +30,11 @@ UQM_SCRIPT_FILES="
 
 #   File                            destination
 UQM_ATTACH_FILES=\
-"${UQM_TOP}AUTHORS	lib/uqm/doc/
-${UQM_TOP}COPYING	lib/uqm/doc/
-${UQM_TOP}ChangeLog	lib/uqm/doc/
-${UQM_TOP}WhatsNew	lib/uqm/doc/
-${UQM_TOP}README	lib/uqm/doc/
-${UQM_TOP}doc/users/manual.txt	lib/uqm/doc/
+"${UQM_TOP}AUTHORS	share/uqm/doc/
+${UQM_TOP}COPYING	share/uqm/doc/
+${UQM_TOP}ChangeLog	share/uqm/doc/
+${UQM_TOP}WhatsNew	share/uqm/doc/
+${UQM_TOP}README	share/uqm/doc/
+${UQM_TOP}doc/users/manual.txt	share/uqm/doc/
 ${UQM_TOP}uqm	lib/uqm/"