diff --git a/pom.xml b/pom.xml
index 4a250d73..c96c6668 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,8 +18,8 @@
     </parent>
 
     <properties>
-        <couchbase>2.4.1</couchbase>
-        <couchbase.osgi>2.4.1</couchbase.osgi>
+        <couchbase>2.4.4</couchbase>
+        <couchbase.osgi>2.4.4</couchbase.osgi>
         <springdata.commons>2.0.0.BUILD-SNAPSHOT</springdata.commons>
     </properties>
 
diff --git a/src/main/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentFactoryBean.java b/src/main/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentFactoryBean.java
index 95990656..3ec71b19 100644
--- a/src/main/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentFactoryBean.java
+++ b/src/main/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentFactoryBean.java
@@ -52,6 +52,17 @@ import org.springframework.beans.factory.config.AbstractFactoryBean;
     eventBus
     systemMetricsCollectorConfig
     networkLatencyMetricsCollectorConfig
+    requestBufferWaitStrategy
+    sslKeystore
+    memcachedHashingStrategy
+    kvIoPool
+    queryIoPool
+    searchIoPool
+    viewIoPool
+    kvServiceConfig
+    queryServiceConfig
+    searchServiceConfig
+    viewServiceConfig
    */
 
   @Override
@@ -199,4 +210,8 @@ import org.springframework.beans.factory.config.AbstractFactoryBean;
   public void setMutationTokensEnabled(boolean mutationTokensEnabled) {
     this.couchbaseEnvBuilder.mutationTokensEnabled(mutationTokensEnabled);
   }
+
+  public void setAnalyticsTimeout(long analyticsTimeout) {
+    this.couchbaseEnvBuilder.analyticsTimeout(analyticsTimeout);
+  }
 }
diff --git a/src/main/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentNoShutdownProxy.java b/src/main/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentNoShutdownProxy.java
index b5355be8..1ef91e5e 100644
--- a/src/main/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentNoShutdownProxy.java
+++ b/src/main/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentNoShutdownProxy.java
@@ -19,7 +19,7 @@ package org.springframework.data.couchbase.config;
 import java.security.KeyStore;
 import java.util.concurrent.TimeUnit;
 
-import com.couchbase.client.core.env.WaitStrategyFactory;
+import com.couchbase.client.core.env.*;
 import com.couchbase.client.core.event.EventBus;
 import com.couchbase.client.core.metrics.MetricsCollector;
 import com.couchbase.client.core.metrics.NetworkLatencyMetricsCollector;
@@ -358,4 +358,34 @@ public class CouchbaseEnvironmentNoShutdownProxy implements CouchbaseEnvironment
   public MemcachedHashingStrategy memcachedHashingStrategy() {
     return delegate.memcachedHashingStrategy();
   }
+
+  @Override
+  public long analyticsTimeout() {
+    return delegate.analyticsTimeout();
+  }
+
+  @Override
+  public long configPollInterval() {
+    return delegate.configPollInterval();
+  }
+
+  @Override
+  public KeyValueServiceConfig kvServiceConfig() {
+    return delegate.kvServiceConfig();
+  }
+
+  @Override
+  public QueryServiceConfig queryServiceConfig() {
+    return delegate.queryServiceConfig();
+  }
+
+  @Override
+  public SearchServiceConfig searchServiceConfig() {
+    return delegate.searchServiceConfig();
+  }
+
+  @Override
+  public ViewServiceConfig viewServiceConfig() {
+    return delegate.viewServiceConfig();
+  }
 }
diff --git a/src/main/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentParser.java b/src/main/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentParser.java
index ee2dfdc2..37b0f1a2 100644
--- a/src/main/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentParser.java
+++ b/src/main/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentParser.java
@@ -64,6 +64,7 @@ import org.springframework.util.StringUtils;
  * <li>{@link DefaultCouchbaseEnvironment.Builder#bufferPoolingEnabled(boolean) bufferPoolingEnabled}</li>
  * <li>{@link DefaultCouchbaseEnvironment.Builder#tcpNodelayEnabled(boolean) tcpNodelayEnabled}</li>
  * <li>{@link DefaultCouchbaseEnvironment.Builder#mutationTokensEnabled(boolean) mutationTokensEnabled}</li>
+ * <li>{@link DefaultCouchbaseEnvironment.Builder#analyticsTimeout(long) analyticsTimeout}</li>
  * </ul>
  *
  * @author Simon Baslé
@@ -135,6 +136,7 @@ public class CouchbaseEnvironmentParser extends AbstractSingleBeanDefinitionPars
 		setPropertyValue(envDefinitionBuilder, envElement, "bufferPoolingEnabled", "bufferPoolingEnabled");
 		setPropertyValue(envDefinitionBuilder, envElement, "tcpNodelayEnabled", "tcpNodelayEnabled");
 		setPropertyValue(envDefinitionBuilder, envElement, "mutationTokensEnabled", "mutationTokensEnabled");
+		setPropertyValue(envDefinitionBuilder, envElement, "analyticsTimeout", "analyticsTimeout");
 
 		//retry strategy is particular, in the xsd this is an enum (FailFast, BestEffort)
 		setPropertyValue(envDefinitionBuilder, envElement, "retryStrategy", "retryStrategy");
diff --git a/src/main/resources/org/springframework/data/couchbase/config/spring-couchbase-env-2.0.xsd b/src/main/resources/org/springframework/data/couchbase/config/spring-couchbase-env-2.0.xsd
index 0647c96b..6973761f 100644
--- a/src/main/resources/org/springframework/data/couchbase/config/spring-couchbase-env-2.0.xsd
+++ b/src/main/resources/org/springframework/data/couchbase/config/spring-couchbase-env-2.0.xsd
@@ -54,6 +54,7 @@
                 <xsd:attribute name="bufferPoolingEnabled" type="xsd:boolean"/>
                 <xsd:attribute name="tcpNodelayEnabled" type="xsd:boolean"/>
                 <xsd:attribute name="mutationTokensEnabled" type="xsd:boolean"/>
+                <xsd:attribute name="analyticsTimeout" type="xsd:long"/>
             </xsd:extension>
         </xsd:complexContent>
     </xsd:complexType>
diff --git a/src/test/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentParserTest.java b/src/test/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentParserTest.java
index 128f0a4e..ddb3f3a1 100644
--- a/src/test/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentParserTest.java
+++ b/src/test/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors
+ * Copyright 2012-2017 the original author or authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -99,6 +99,7 @@ public class CouchbaseEnvironmentParserTest {
     assertThat(env.bufferPoolingEnabled(), allOf(equalTo(false), not(defaultEnv.bufferPoolingEnabled())));
     assertThat(env.tcpNodelayEnabled(), allOf(equalTo(false), not(defaultEnv.tcpNodelayEnabled())));
     assertThat(env.mutationTokensEnabled(), allOf(equalTo(true), not(defaultEnv.mutationTokensEnabled())));
+    assertThat(env.analyticsTimeout(), is(equalTo(30L)));
   }
 
   @AfterClass
diff --git a/src/test/resources/configurations/couchbaseEnv-bean.xml b/src/test/resources/configurations/couchbaseEnv-bean.xml
index 65ab5b25..52b8348f 100644
--- a/src/test/resources/configurations/couchbaseEnv-bean.xml
+++ b/src/test/resources/configurations/couchbaseEnv-bean.xml
@@ -43,6 +43,7 @@
                    bufferPoolingEnabled="false"
                    tcpNodelayEnabled="false"
                    mutationTokensEnabled="true"
+                   analyticsTimeout = "30"
                    />
 
 </beans>
\ No newline at end of file