diff --git a/CHANGES.txt b/CHANGES.txt
index fbb766fb4c6..f188ec6553c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -275,6 +275,8 @@ Release 0.21.1 - Unreleased
 
     HADOOP-6971. Clover build doesn't generate per-test coverage (cos)
 
+    HADOOP-6993. Broken link on cluster setup page of docs. (eli)
+
 Release 0.21.0 - 2010-08-13
 
   INCOMPATIBLE CHANGES
diff --git a/src/docs/src/documentation/content/xdocs/cluster_setup.xml b/src/docs/src/documentation/content/xdocs/cluster_setup.xml
index 8bdec1fca68..ddb75062d2e 100644
--- a/src/docs/src/documentation/content/xdocs/cluster_setup.xml
+++ b/src/docs/src/documentation/content/xdocs/cluster_setup.xml
@@ -81,7 +81,7 @@
         <ol>
           <li>
             Read-only default configuration - 
-            <a href="ext:common-default">src/core/core-default.xml</a>, 
+            <a href="ext:core-default">src/core/core-default.xml</a>, 
             <a href="ext:hdfs-default">src/hdfs/hdfs-default.xml</a>, 
             <a href="ext:mapred-default">src/mapred/mapred-default.xml</a> and
             <a href="ext:mapred-queues">conf/mapred-queues.xml.template</a>.
diff --git a/src/docs/src/documentation/content/xdocs/site.xml b/src/docs/src/documentation/content/xdocs/site.xml
index e71e8a5cca3..5415f361771 100644
--- a/src/docs/src/documentation/content/xdocs/site.xml
+++ b/src/docs/src/documentation/content/xdocs/site.xml
@@ -67,7 +67,7 @@ See http://forrest.apache.org/docs/linking.html for more info.
     <wiki  href="http://wiki.apache.org/hadoop/Common" />
     <faq  href="http://wiki.apache.org/hadoop/Common/FAQ" />
     
-    <common-default href="http://hadoop.apache.org/common/docs/current/common-default.html" />
+    <core-default href="http://hadoop.apache.org/common/docs/current/core-default.html" />
     <hdfs-default href="http://hadoop.apache.org/hdfs/docs/current/hdfs-default.html" />
     <mapred-default href="http://hadoop.apache.org/mapreduce/docs/current/mapred-default.html" />