Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java
===================================================================
--- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java	(revision 1759223)
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java	(working copy)
@@ -17,6 +17,7 @@
 package org.apache.jackrabbit.oak.plugins.document.util;
 
 import java.net.UnknownHostException;
+import java.util.concurrent.TimeUnit;
 
 import javax.annotation.Nonnull;
 
@@ -34,6 +35,8 @@
  */
 public class MongoConnection {
 
+    private static final int DEFAULT_MAX_WAIT_TIME = (int) TimeUnit.MINUTES.toMillis(1);
+    private static final int DEFAULT_SOCKET_TIMEOUT = (int) TimeUnit.MINUTES.toMillis(1);
     private static final WriteConcern WC_UNKNOWN = new WriteConcern("unknown");
     private final MongoClientURI mongoURI;
     private final MongoClient mongo;
@@ -98,6 +101,8 @@
     public static MongoClientOptions.Builder getDefaultBuilder() {
         return new MongoClientOptions.Builder()
                 .description("MongoConnection for Oak DocumentMK")
+                .maxWaitTime(DEFAULT_MAX_WAIT_TIME)
+                .socketTimeout(DEFAULT_SOCKET_TIMEOUT)
                 .threadsAllowedToBlockForConnectionMultiplier(100);
     }