diff --git a/CHANGES.txt b/CHANGES.txt
index 207c74791d..93ec05094d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -209,6 +209,9 @@ Trunk (unreleased changes)
     HADOOP-7383. HDFS needs to export protobuf library dependency in pom.
     (todd via eli)
 
+    HADOOP-7374. Don't add tools.jar to the classpath when running Hadoop.
+    (eli)
+
   OPTIMIZATIONS
   
     HADOOP-7333. Performance improvement in PureJavaCrc32. (Eric Caspole
diff --git a/bin/hadoop-config.sh b/bin/hadoop-config.sh
index 11d3157229..6389ac5681 100644
--- a/bin/hadoop-config.sh
+++ b/bin/hadoop-config.sh
@@ -130,7 +130,6 @@ fi
 
 # CLASSPATH initially contains $HADOOP_CONF_DIR
 CLASSPATH="${HADOOP_CONF_DIR}"
-CLASSPATH=${CLASSPATH}:$JAVA_HOME/lib/tools.jar
 
 # for developers, add Hadoop classes to CLASSPATH
 if [ -d "$HADOOP_PREFIX/build/classes" ]; then
diff --git a/bin/rcc b/bin/rcc
index d5bcca54e1..9433e98314 100755
--- a/bin/rcc
+++ b/bin/rcc
@@ -52,7 +52,6 @@ JAVA_HEAP_MAX=-Xmx1000m
 
 # CLASSPATH initially contains $HADOOP_CONF_DIR
 CLASSPATH="${HADOOP_CONF_DIR}"
-CLASSPATH=${CLASSPATH}:$JAVA_HOME/lib/tools.jar
 
 # for developers, add Hadoop classes to CLASSPATH
 if [ -d "$HADOOP_PREFIX/build/classes" ]; then