diff --git a/CHANGES.txt b/CHANGES.txt
index d3392a2fda..cf2806e1a7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -299,6 +299,9 @@ Release 0.21.1 - Unreleased
     HADOOP-6944. [Herriot] Implement a functionality for getting proxy users
     definitions like groups and hosts. (Vinay Thota via cos)
 
+    HADOOP-6954.  Sources JARs are not correctly published to the Maven
+    repository. (tomwhite)
+
 Release 0.21.0 - 2010-08-13
 
   INCOMPATIBLE CHANGES
diff --git a/build.xml b/build.xml
index 8147805955..444c693393 100644
--- a/build.xml
+++ b/build.xml
@@ -1258,7 +1258,8 @@
        <pom refid="hadoop.core"/>
        <attach file="${hadoop-common.jar}.asc" type="jar.asc"/>
        <attach file="${hadoop-common.pom}.asc" type="pom.asc"/>
-       <attach file="${hadoop-common-sources.jar}.asc" type="jar.asc" />
+       <attach file="${hadoop-common-sources.jar}.asc" type="jar.asc"
+         classifier="sources"/>
        <attach file="${hadoop-common-sources.jar}" classifier="sources"/>
      </artifact:deploy>
 
@@ -1267,7 +1268,8 @@
        <pom refid="hadoop.core.test"/>
        <attach file="${hadoop-common-test.jar}.asc" type="jar.asc"/>
        <attach file="${hadoop-common-test.pom}.asc" type="pom.asc"/>
-       <attach file="${hadoop-common-test-sources.jar}.asc" type="jar.asc"/>
+       <attach file="${hadoop-common-test-sources.jar}.asc" type="jar.asc"
+         classifier="sources"/>
        <attach file="${hadoop-common-test-sources.jar}" classifier="sources"/>
      </artifact:deploy>
 
@@ -1277,7 +1279,7 @@
        <attach file="${hadoop-common-instrumented.jar}.asc" type="jar.asc"/>
        <attach file="${hadoop-common-instrumented.pom}.asc" type="pom.asc"/>
        <attach file="${hadoop-common-instrumented-sources.jar}.asc" 
-         type="jar.asc"/>
+         type="jar.asc" classifier="sources"/>
        <attach file="${hadoop-common-instrumented-sources.jar}"
          classifier="sources"/>
      </artifact:deploy>