diff --git a/bin/check-python-syntax.sh b/bin/check-python-syntax.sh
index 952360b5a..5576297ff 100755
--- a/bin/check-python-syntax.sh
+++ b/bin/check-python-syntax.sh
@@ -28,7 +28,7 @@ for file in $(git ls-files '**/*.py'); do
         continue
     fi
     # Skip the shell's pkg_resources.py
-    if [[ "${file}" == "shell/pkg_resources.py" ]]; then
+    if [[ "${file}" == "shell/legacy/pkg_resources.py" ]]; then
         continue
     fi
 
diff --git a/bin/rat_exclude_files.txt b/bin/rat_exclude_files.txt
index 13edc28e0..a936c650d 100644
--- a/bin/rat_exclude_files.txt
+++ b/bin/rat_exclude_files.txt
@@ -225,7 +225,7 @@ cmake_modules/FindJNI.cmake
 
 # http://www.apache.org/legal/resolved.html#category-a : Python Software Foundation
 # License is allowed.
-shell/pkg_resources.py
+shell/legacy/pkg_resources.py
 
 # Notices in Impala as required by ASF rules:
 DISCLAIMER
diff --git a/shell/pkg_resources.py b/shell/legacy/pkg_resources.py
similarity index 100%
rename from shell/pkg_resources.py
rename to shell/legacy/pkg_resources.py
diff --git a/shell/make_shell_tarball.sh b/shell/make_shell_tarball.sh
index 8e0658f41..20704e86a 100755
--- a/shell/make_shell_tarball.sh
+++ b/shell/make_shell_tarball.sh
@@ -186,7 +186,7 @@ cp ${SHELL_HOME}/impala_shell.py ${TARBALL_ROOT}
 cp ${SHELL_HOME}/compatibility.py ${TARBALL_ROOT}
 cp ${SHELL_HOME}/thrift_printer.py ${TARBALL_ROOT}
 
-cp ${SHELL_HOME}/pkg_resources.py ${TARBALL_ROOT}/legacy
+cp ${SHELL_HOME}/legacy/pkg_resources.py ${TARBALL_ROOT}/legacy
 
 pushd ${BUILD_DIR} > /dev/null
 echo "Making tarball in ${BUILD_DIR}"