diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 0da7b1a81f0..4e96ca34f18 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -88,6 +88,10 @@ Upgrade Notes
 
 * SOLR-11957: The default Solr log file size and number of backups is raised to 32MB and 10 respectively
 
+* SOLR-12067: The default value of `autoReplicaFailoverWaitAfterExpiration` has been increased to 120 seconds
+  from the earlier default of 30 seconds. This affects how soon Solr adds new replicas to replace the replicas
+  on nodes which have either crashed or shutdown.
+
 New Features
 ----------------------
 * SOLR-11285: Simulation framework for autoscaling. (ab)
@@ -380,6 +384,9 @@ Other Changes
 
 * SOLR-12051: Election timeout when no replicas are qualified to become leader (Cao Manh Dat)
 
+* SOLR-12067: Increase autoAddReplicas default 30 second wait time to 120 seconds.
+  (Varun Thacker, Mark Miller via shalin)
+
 ==================  7.2.1 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/core/src/java/org/apache/solr/core/CloudConfig.java b/solr/core/src/java/org/apache/solr/core/CloudConfig.java
index b971a0b7f3e..6248b457d03 100644
--- a/solr/core/src/java/org/apache/solr/core/CloudConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/CloudConfig.java
@@ -130,8 +130,7 @@ public class CloudConfig {
     private static final int DEFAULT_CREATE_COLLECTION_ACTIVE_WAIT = 30;  // 30 seconds
     private static final boolean DEFAULT_CREATE_COLLECTION_CHECK_LEADER_ACTIVE = false; 
  
-    // TODO: tune defaults
-    private static final int DEFAULT_AUTO_REPLICA_FAILOVER_WAIT_AFTER_EXPIRATION = 30000;
+    private static final int DEFAULT_AUTO_REPLICA_FAILOVER_WAIT_AFTER_EXPIRATION = 120000;
 
     private String zkHost = System.getProperty("zkHost");
     private int zkClientTimeout = Integer.getInteger("zkClientTimeout", DEFAULT_ZK_CLIENT_TIMEOUT);