diff --git a/Makefile b/Makefile
index a6afa1894d8..4dca5cf0235 100644
--- a/Makefile
+++ b/Makefile
@@ -189,6 +189,7 @@ INSTALL_CORE_FILES = \
 	ext \
 	tools/app_reg \
 	tools/virtual-bootstrap \
+	tools/relocatable.sh \
 	VERS* LICENSE* README*
 
 .PHONY: install
diff --git a/Makefile.tarball b/Makefile.tarball
index 9bef8581097..00ed25cf31d 100644
--- a/Makefile.tarball
+++ b/Makefile.tarball
@@ -27,6 +27,7 @@ PROD_INCLUDES := \
 	maven \
 	tools/app_reg \
 	tools/virtual-bootstrap \
+	tools/relocatable.sh \
 	VERSION \
 	VERSION_DATA
 
diff --git a/tools/relocatable.sh b/tools/relocatable.sh
new file mode 100644
index 00000000000..f578962b76c
--- /dev/null
+++ b/tools/relocatable.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+# Licensed to Cloudera, Inc. under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  Cloudera, Inc. licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -e
+
+usage() {
+  echo "
+  Make a Hue installation relocatable. Run this in the installation
+  directory created by 'make install', before you relocate it.
+  Usage:
+      $0
+  "
+  exit 1
+}
+
+if [ $# != 0 ] ; then
+  usage
+fi
+
+# We're in <hue_root>/tools
+CURR_DIR="$(dirname $0)"
+HUE_ROOT="$CURR_DIR/.."
+ENV_PYTHON="$HUE_ROOT/build/env/bin/python"
+VIRTUAL_BOOTSTRAP="$CURR_DIR/virtual-bootstrap/virtual-bootstrap.py"
+
+# Step 1. Fix virtualenv
+$ENV_PYTHON $VIRTUAL_BOOTSTRAP --relocatable "$HUE_ROOT/build/env"
+
+# Step 1b. Fix any broken lib64 directory
+LIB64="$HUE_ROOT/build/env/lib64"
+if [ -L "$LIB64" -a ! -e "$LIB64" ] ; then
+  rm "$LIB64"
+  ln -s lib "$LIB64"
+fi
+
+# Step 2. Fix .ini symlinks for all apps (make them relative)
+for app in $HUE_ROOT/apps/* ; do
+  if [ -d "$app/conf" ] ; then
+    appname=$(basename $app)
+    pushd "$HUE_ROOT/desktop/conf"
+    ln -sfv ../../apps/$appname/conf/*.ini .
+    popd
+  fi
+done
+
+# Step 3. Clean up any old .pyc files
+find "$HUE_ROOT" . -name "*.pyc" -exec rm -f {} \;