diff --git a/CHANGES.txt b/CHANGES.txt
index 118db5f1f44..357ddbb7153 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -286,7 +286,9 @@ Release 0.90.3 - Unreleased
    HBASE-2470  Add Scan.setTimeRange() support in Shell (Harsh J Chouraria)
    HBASE-3805  Log RegionState that are processed too late in the master
    HBASE-3695  Some improvements to Hbck to test the entire region chain in
-               Meta and provide better error reporting (Marc Limotte)
+                Meta and provide better error reporting (Marc Limotte)
+   HBASE-3813  Change RPC callQueue size from 'handlerCount *
+               MAX_QUEUE_SIZE_PER_HANDLER;'
 
   TASKS
    HBASE-3748  Add rolling of thrift/rest daemons to graceful_stop.sh script
diff --git a/src/main/java/org/apache/hadoop/hbase/ipc/HBaseServer.java b/src/main/java/org/apache/hadoop/hbase/ipc/HBaseServer.java
index 3c845dcc761..243c68b944d 100644
--- a/src/main/java/org/apache/hadoop/hbase/ipc/HBaseServer.java
+++ b/src/main/java/org/apache/hadoop/hbase/ipc/HBaseServer.java
@@ -89,7 +89,7 @@ public abstract class HBaseServer implements RpcServer {
   /**
    * How many calls/handler are allowed in the queue.
    */
-  private static final int MAX_QUEUE_SIZE_PER_HANDLER = 100;
+  private static final int DEFAULT_MAX_QUEUE_SIZE_PER_HANDLER = 10;
 
   private static final String WARN_RESPONSE_SIZE =
       "hbase.ipc.warn.response.size";
@@ -1174,7 +1174,9 @@ public abstract class HBaseServer implements RpcServer {
     this.handlerCount = handlerCount;
     this.priorityHandlerCount = priorityHandlerCount;
     this.socketSendBufferSize = 0;
-    this.maxQueueSize = handlerCount * MAX_QUEUE_SIZE_PER_HANDLER;
+    this.maxQueueSize =
+      this.conf.getInt("ipc.server.max.queue.size",
+        handlerCount * DEFAULT_MAX_QUEUE_SIZE_PER_HANDLER);
      this.readThreads = conf.getInt(
         "ipc.server.read.threadpool.size",
         10);