diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 8c6cf164d71..9f3cb1999f5 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -535,6 +535,9 @@ Release 2.6.0 - UNRELEASED
     HADOOP-11064. UnsatisifedLinkError with hadoop 2.4 JARs on hadoop-2.6 due to
     NativeCRC32 method changes. (cnauroth)
 
+    HADOOP-11048. user/custom LogManager fails to load if the client
+    classloader is enabled (Sangjin Lee via jlowe)
+
 Release 2.5.1 - 2014-09-05
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java
index 75b43b63fbd..4b26b7611d6 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/RunJar.java
@@ -176,7 +176,7 @@ public class RunJar {
     }
     mainClassName = mainClassName.replaceAll("/", ".");
 
-    File tmpDir = new File(new Configuration().get("hadoop.tmp.dir"));
+    File tmpDir = new File(System.getProperty("java.io.tmpdir"));
     ensureDirectory(tmpDir);
 
     final File workDir;
@@ -185,7 +185,7 @@ public class RunJar {
     } catch (IOException ioe) {
       // If user has insufficient perms to write to tmpDir, default  
       // "Permission denied" message doesn't specify a filename. 
-      System.err.println("Error creating temp dir in hadoop.tmp.dir "
+      System.err.println("Error creating temp dir in java.io.tmpdir "
                          + tmpDir + " due to " + ioe.getMessage());
       System.exit(-1);
       return;