diff --git a/bin/mrql b/bin/mrql
index fd1ec60..1bc759f 100755
--- a/bin/mrql
+++ b/bin/mrql
@@ -51,7 +51,11 @@
 fi
 
 if [ "$1" == "-local" ] || [ "$1" == "-dist" ]; then
-   $HADOOP_HOME/bin/hadoop --config $HADOOP_CONFIG jar $FULL_JAR org.apache.mrql.Main $*
+    if [ "$HADOOP_CONFIG" == "" ]; then
+        $HADOOP_HOME/bin/hadoop jar $FULL_JAR org.apache.mrql.Main $*
+    else
+        $HADOOP_HOME/bin/hadoop --config $HADOOP_CONFIG jar $FULL_JAR org.apache.mrql.Main $*
+    fi
 else
    $JAVA_HOME/bin/java -classpath "$FULL_JAR:$HADOOP_JARS" org.apache.mrql.Main $*
 fi
diff --git a/conf/mrql-env.sh b/conf/mrql-env.sh
index 921f30d..a9b16cb 100644
--- a/conf/mrql-env.sh
+++ b/conf/mrql-env.sh
@@ -120,16 +120,7 @@
 fi
 fi
 
-if [[ -f ${HADOOP_HOME}/share/hadoop/common/hadoop-common-${HADOOP_VERSION}.jar ]]; then
-   # hadoop 2.x (YARN)
-   HADOOP_JARS=${HADOOP_HOME}/share/hadoop/common/hadoop-common-${HADOOP_VERSION}.jar:${HADOOP_HOME}/share/hadoop/mapreduce/hadoop-mapreduce-client-core-${HADOOP_VERSION}.jar:${HADOOP_HOME}/share/hadoop/hdfs/hadoop-hdfs-${HADOOP_VERSION}.jar:${HADOOP_HOME}/share/hadoop/common/lib/hadoop-annotations-${HADOOP_VERSION}.jar:${HADOOP_HOME}/share/hadoop/common/lib/log4j-1.2.17.jar:${HADOOP_HOME}/share/hadoop/common/lib/commons-cli-1.2.jar:${HADOOP_HOME}/share/hadoop/common/lib/commons-logging-1.1.3.jar:${HADOOP_HOME}/share/hadoop/common/lib/guava-11.0.2.jar:${HADOOP_HOME}/share/hadoop/common/lib/commons-collections-3.2.1.jar
-else if [[ -f ${HADOOP_HOME}/hadoop-core-${HADOOP_VERSION}.jar ]]; then
-   # hadoop 1.x or 0.20.x
-   HADOOP_JARS=${HADOOP_HOME}/hadoop-core-${HADOOP_VERSION}.jar:${HADOOP_HOME}/lib/commons-logging-1.1.1.jar:${HADOOP_HOME}/lib/log4j-1.2.15.jar:${HADOOP_HOME}/lib/commons-cli-1.2.jar
-else
-   echo "*** Cannot find the hadoop jar files. Need to edit mrql-env.sh"; exit -1
-fi
-fi
+HADOOP_JARS=`$HADOOP_HOME/bin/hadoop classpath`
 
 if [[ !(-f ${CUP_JAR}) ]]; then
    echo "*** Cannot find the parser generator CUP jar file. Need to edit mrql-env.sh"; exit -1
diff --git a/pom.xml b/pom.xml
index 546e3b5..bd9079b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -273,6 +273,11 @@
         </dependency>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-yarn-common</artifactId>
+          <version>${hadoop.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-mapreduce-client-core</artifactId>
           <version>${hadoop.version}</version>
         </dependency>