diff --git a/dist/pom.xml b/dist/pom.xml
index 2035480b..ede3be73 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -21,6 +21,13 @@ limitations under the License.
 
   <modelVersion>4.0.0</modelVersion>
 
+  <properties>
+    <tomcat.majorVersion>6</tomcat.majorVersion>
+    <tomcat.minorVersion>0.35</tomcat.minorVersion>
+    <tomcat.version>${tomcat.majorVersion}.${tomcat.minorVersion}</tomcat.version>
+  </properties>
+
+
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>sqoop</artifactId>
@@ -72,10 +79,10 @@ limitations under the License.
                     <mkdir dir="target/sqoop-${project.version}"/>
 
                     <!-- server -->
-                    <get src="http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.27/bin/apache-tomcat-7.0.27.tar.gz"
+                    <get src="http://archive.apache.org/dist/tomcat/tomcat-${tomcat.majorVersion}/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.tar.gz"
                          dest="target/apache-tomcat.tar.gz" verbose="true" skipexisting="true"/>
                     <untar src="target/apache-tomcat.tar.gz" dest="target" compression="gzip"/>
-                    <move file="target/apache-tomcat-7.0.27" tofile="target/sqoop-${project.version}/server"/>
+                    <move file="target/apache-tomcat-${tomcat.version}" tofile="target/sqoop-${project.version}/server"/>
                     <copy todir="target/sqoop-${project.version}/server/bin">
                       <fileset dir="src/main/server/bin"/>
                     </copy>
diff --git a/dist/src/main/bin/sqoop.sh b/dist/src/main/bin/sqoop.sh
index f644147f..dd2e3231 100755
--- a/dist/src/main/bin/sqoop.sh
+++ b/dist/src/main/bin/sqoop.sh
@@ -34,6 +34,9 @@ CUR_DIR=`cd $(dirname $(which $0))/..; pwd`
 cd ${CUR_DIR}
 echo "Sqoop home directory: ${CUR_DIR}..."
 
+CATALINA_BIN=${CATALINA_BIN:-server/bin}
+CLIENT_LIB=${CLIENT_LIB:-client/lib}
+
 COMMAND=$1
 case $COMMAND in
   server)
@@ -42,12 +45,12 @@ case $COMMAND in
       exit
     fi
 
-    server/bin/catalina.sh $2
+    $CATALINA_BIN/catalina.sh $2
     ;;
 
   client)
     # Build class path with full path to each library
-    for f in client/lib/*.jar; do
+    for f in $CLIENT_LIB/*.jar; do
       CLASSPATH=${CLASSPATH}:`readlink -f $f`;
     done