diff --git a/CHANGES.txt b/CHANGES.txt
index ebe159faf2d..b1874cb9495 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -267,6 +267,8 @@ Release 0.21.0 - Unreleased
    HBASE-2335  mapred package docs don't say zookeeper jar is a dependent
    HBASE-2417  HCM.locateRootRegion fails hard on "Connection refused"
    HBASE-2346  Usage of FilterList slows down scans
+   HBASE-2341  ZK settings for initLimit/syncLimit should not have been removed
+               from hbase-default.xml
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable
diff --git a/core/src/main/resources/hbase-default.xml b/core/src/main/resources/hbase-default.xml
index 7a627bb39e1..85fa5a0860a 100644
--- a/core/src/main/resources/hbase-default.xml
+++ b/core/src/main/resources/hbase-default.xml
@@ -501,6 +501,21 @@
       <value>10</value>
     </property>
   -->
+  <property>
+    <name>hbase.zookeeper.property.initLimit</name>
+    <value>10</value>
+    <description>Property from ZooKeeper's config zoo.cfg.
+    The number of ticks that the initial synchronization phase can take.
+    </description>
+  </property>
+  <property>
+    <name>hbase.zookeeper.property.syncLimit</name>
+    <value>5</value>
+    <description>Property from ZooKeeper's config zoo.cfg.
+    The number of ticks that can pass between sending a request and getting an
+    acknowledgment.
+    </description>
+  </property>
   <property>
     <name>hbase.zookeeper.property.dataDir</name>
     <value>${hbase.tmp.dir}/zookeeper</value>