diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index bff4c3187a5..e59fe9b5afc 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -392,6 +392,9 @@ Other Changes
 * SOLR-5700: Improve error handling of remote queries (proxied requests).
   (Greg Chanan, Steve Davids via Mark Miller)
 
+* SOLR-5585: Raise Collections API timeout to 3 minutes from one minute.
+  (Mark Miller)
+
 ==================  4.6.1  ==================
 
 Versions of Major Components
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
index 46cbd76974f..585f1f81364 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
@@ -226,7 +226,7 @@ public class CollectionsHandler extends RequestHandlerBase {
     handleResponse(action.toString().toLowerCase(Locale.ROOT), m, rsp);
   }
 
-  public static long DEFAULT_ZK_TIMEOUT = 60*1000;
+  public static long DEFAULT_ZK_TIMEOUT = 180*1000;
 
   private void handleResponse(String operation, ZkNodeProps m,
                               SolrQueryResponse rsp) throws KeeperException, InterruptedException {