diff --git a/CHANGES.txt b/CHANGES.txt
index 417b1b4cf7..877d2507c2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -708,6 +708,9 @@ Release 0.22.0 - Unreleased
     HADOOP-7300. Configuration methods that return collections are inconsistent
     about mutability. (todd)
 
+    HADOOP-7305. Eclipse project classpath should include tools.jar from JDK.
+    (Niels Basjes via todd)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS
diff --git a/build.xml b/build.xml
index 26ccfa087e..168b34f952 100644
--- a/build.xml
+++ b/build.xml
@@ -1571,6 +1571,7 @@
         <library pathref="ivy-test.classpath" exported="false" />
         <variable path="ANT_HOME/lib/ant.jar" exported="false" />
         <library path="${conf.dir}" exported="false" />
+        <library path="${java.home}/../lib/tools.jar" exported="false" />
       </classpath>
     </eclipse>
   </target>