diff --git a/pom.xml b/pom.xml
index 7747a5b2..2e53e736 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,26 @@
 		<version>1.1.5.BUILD-SNAPSHOT</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
+	
+	<dependencyManagement>
+	<dependencies>
+		<dependency>
+			<groupId>com.netflix.eureka</groupId>
+			<artifactId>eureka-client</artifactId>
+			<version>1.1.135</version>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.eureka</groupId>
+			<artifactId>eureka-client</artifactId>
+			<version>1.1.135</version>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.12.6</version>
+		</dependency>
+	</dependencies>
+	</dependencyManagement>
 
 	<dependencies>
 		<dependency>
@@ -29,12 +49,15 @@
 		<dependency>
 			<groupId>com.netflix.eureka</groupId>
 			<artifactId>eureka-client</artifactId>
-			<version>1.1.135</version>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.eureka</groupId>
+			<artifactId>eureka-client</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.12.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientConfigBean.java b/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientConfigBean.java
index ab35f4b6..09bf489a 100644
--- a/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientConfigBean.java
+++ b/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientConfigBean.java
@@ -38,6 +38,8 @@ public class EurekaClientConfigBean implements EurekaClientConfig {
 	public static final String DEFAULT_ZONE = "defaultZone";
 	
 	private static final int MINUTES = 60;
+	
+	private boolean enabled = true;
 
 	private int registryFetchIntervalSeconds = 30;