diff --git a/CHANGES.txt b/CHANGES.txt
index a5c7b5cbae..40eb81d053 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -656,6 +656,9 @@ Release 0.21.0 - Unreleased
     HADOOP-6367. Removes Access Token implementation from common.
     (Kan Zhang via ddas)
 
+    HADOOP-6395. Upgrade some libraries to be consistent across common, hdfs,
+    and mapreduce. (omalley)
+
   OPTIMIZATIONS
 
     HADOOP-5595. NameNode does not need to run a replicator to choose a
diff --git a/ivy/hadoop-core-template.xml b/ivy/hadoop-core-template.xml
index 4bc20d05ef..34cb6c08ed 100644
--- a/ivy/hadoop-core-template.xml
+++ b/ivy/hadoop-core-template.xml
@@ -121,7 +121,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>avro</artifactId>
-      <version>1.0.0</version>
+      <version>1.2.0</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/ivy/libraries.properties b/ivy/libraries.properties
index aa95a37cdb..d3ee8694d7 100644
--- a/ivy/libraries.properties
+++ b/ivy/libraries.properties
@@ -27,8 +27,8 @@ commons-codec.version=1.3
 commons-collections.version=3.1
 commons-httpclient.version=3.0.1
 commons-lang.version=2.4
-commons-logging.version=1.0.4
-commons-logging-api.version=1.0.4
+commons-logging.version=1.1.1
+commons-logging-api.version=1.1
 commons-el.version=1.0
 commons-fileupload.version=1.2
 commons-io.version=1.4
@@ -78,4 +78,4 @@ slf4j-log4j12.version=1.4.3
 xmlenc.version=0.52
 xerces.version=1.4.4
 
-aspectj.version=1.6.4
+aspectj.version=1.6.5