diff --git a/pom.xml b/pom.xml
index 5c65f16..1dc5430 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,17 @@
 			<artifactId>spring-cloud-netflix-core</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-netflix-eureka-server</artifactId>
+			<optional>true</optional>
+			<exclusions>
+				<exclusion>
+					<artifactId>spring-boot-starter-log4j</artifactId>
+					<groupId>org.springframework.boot</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-mongodb</artifactId>
diff --git a/src/main/java/org/springframework/cloud/cloudfoundry/broker/configuration/CatalogLeaseManager.java b/src/main/java/org/springframework/cloud/cloudfoundry/broker/configuration/CatalogLeaseManager.java
index 6071f03..5427e19 100644
--- a/src/main/java/org/springframework/cloud/cloudfoundry/broker/configuration/CatalogLeaseManager.java
+++ b/src/main/java/org/springframework/cloud/cloudfoundry/broker/configuration/CatalogLeaseManager.java
@@ -28,10 +28,10 @@ import org.cloudfoundry.community.servicebroker.model.ServiceDefinition;
 import org.cloudfoundry.community.servicebroker.service.BeanCatalogService;
 import org.cloudfoundry.community.servicebroker.service.CatalogService;
 import org.springframework.cloud.cloudfoundry.broker.FreeServiceDefinitionFactory;
-import org.springframework.cloud.netflix.eureka.advice.LeaseManagerLite;
-import org.springframework.cloud.netflix.eureka.event.EurekaInstanceCanceledEvent;
-import org.springframework.cloud.netflix.eureka.event.EurekaInstanceRegisteredEvent;
-import org.springframework.cloud.netflix.eureka.event.EurekaInstanceRenewedEvent;
+import org.springframework.cloud.netflix.eureka.server.advice.LeaseManagerLite;
+import org.springframework.cloud.netflix.eureka.server.event.EurekaInstanceCanceledEvent;
+import org.springframework.cloud.netflix.eureka.server.event.EurekaInstanceRegisteredEvent;
+import org.springframework.cloud.netflix.eureka.server.event.EurekaInstanceRenewedEvent;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.event.SmartApplicationListener;