diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 9130a8d8bb9..f8535e118c6 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -2530,6 +2530,9 @@ Release 2.6.5 - UNRELEASED
 
   BUG FIXES
 
+    HADOOP-12773. HBase classes fail to load with client/job classloader
+    enabled (sjlee)
+
 Release 2.6.4 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-common-project/hadoop-common/src/main/resources/org.apache.hadoop.application-classloader.properties b/hadoop-common-project/hadoop-common/src/main/resources/org.apache.hadoop.application-classloader.properties
index 2264920ed50..cbbb88764d1 100644
--- a/hadoop-common-project/hadoop-common/src/main/resources/org.apache.hadoop.application-classloader.properties
+++ b/hadoop-common-project/hadoop-common/src/main/resources/org.apache.hadoop.application-classloader.properties
@@ -50,6 +50,7 @@ system.classes.default=java.,\
   org.xml.sax.,\
   org.apache.commons.logging.,\
   org.apache.log4j.,\
+  -org.apache.hadoop.hbase.,\
   org.apache.hadoop.,\
   core-default.xml,\
   hdfs-default.xml,\