diff --git a/CHANGES.txt b/CHANGES.txt
index eaeae63dbc..36e2ab2f32 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -74,6 +74,9 @@ Trunk (unreleased changes)
 
     HADOOP-6454. Create setup.py for EC2 cloud scripts. (tomwhite)
 
+    HADOOP-6435. Make RPC.waitForProxy with timeout public. (Steve Loughran
+    via tomwhite)
+
   OPTIMIZATIONS
 
   BUG FIXES
diff --git a/src/java/org/apache/hadoop/ipc/RPC.java b/src/java/org/apache/hadoop/ipc/RPC.java
index 112c090619..c755415231 100644
--- a/src/java/org/apache/hadoop/ipc/RPC.java
+++ b/src/java/org/apache/hadoop/ipc/RPC.java
@@ -171,7 +171,7 @@ public class RPC {
    * @return the proxy
    * @throws IOException if the far end through a RemoteException
    */
-  static Object waitForProxy(Class protocol, long clientVersion,
+  public static Object waitForProxy(Class protocol, long clientVersion,
                              InetSocketAddress addr, Configuration conf,
                              long timeout) throws IOException { 
     long startTime = System.currentTimeMillis();