diff --git a/CHANGES.txt b/CHANGES.txt
index dfb76e6dd4a..17465ebbf8f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,6 +13,7 @@ Release 0.19.0 - Unreleased
    HBASE-994   IPC interfaces with different versions can cause problems
    HBASE-1028  If key does not exist, return null in getRow rather than an
                empty RowResult
+   HBASE-1134  OOME in HMaster when HBaseRPC is older than 0.19
 
   BUG FIXES
    HBASE-891   HRS.validateValuesLength throws IOE, gets caught in the retries
diff --git a/src/java/org/apache/hadoop/hbase/ipc/HBaseServer.java b/src/java/org/apache/hadoop/hbase/ipc/HBaseServer.java
index 368069caf67..1e28c7318f0 100644
--- a/src/java/org/apache/hadoop/hbase/ipc/HBaseServer.java
+++ b/src/java/org/apache/hadoop/hbase/ipc/HBaseServer.java
@@ -75,7 +75,8 @@ public abstract class HBaseServer {
   public static final ByteBuffer HEADER = ByteBuffer.wrap("hrpc".getBytes());
   
   // 1 : Introduce ping and server does not throw away RPCs
-  public static final byte CURRENT_VERSION = 2;
+  // 3 : RPC was refactored in 0.19 
+  public static final byte CURRENT_VERSION = 3;
   
   /**
    * How many calls/handler are allowed in the queue.