diff --git a/pom.xml b/pom.xml
index 1f09f57d..31c14754 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,6 +151,10 @@
 						<artifactId>log4j</artifactId>
 						<groupId>log4j</groupId>
 					</exclusion>
+					<exclusion>
+						<artifactId>com.netflix.blitz4j</artifactId>
+						<groupId>blitz4j</groupId>
+					</exclusion>
 				</exclusions>
 			</dependency>
 			<!-- Eureka core dep that is now optional -->
@@ -163,7 +167,7 @@
 			<dependency>
 				<groupId>com.netflix.blitz4j</groupId>
 				<artifactId>blitz4j</artifactId>
-				<version>1.34</version>
+				<version>1.36.0</version>
 			</dependency>
 			<dependency>
 				<groupId>com.netflix.feign</groupId>
diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml
index a7f02e1a..cf286440 100644
--- a/spring-cloud-netflix-eureka-server/pom.xml
+++ b/spring-cloud-netflix-eureka-server/pom.xml
@@ -20,16 +20,6 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
-			<exclusions>
-				<exclusion>
-					<artifactId>spring-boot-starter-logging</artifactId>
-					<groupId>org.springframework.boot</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-log4j</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -38,12 +28,6 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-freemarker</artifactId>
-			<exclusions>
-				<exclusion>
-					<artifactId>spring-boot-starter-logging</artifactId>
-					<groupId>org.springframework.boot</groupId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
@@ -57,6 +41,10 @@
 			<groupId>com.netflix.eureka</groupId>
 			<artifactId>eureka-client</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.netflix.blitz4j</groupId>
+			<artifactId>blitz4j</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.sun.jersey</groupId>
 			<artifactId>jersey-servlet</artifactId>
@@ -69,16 +57,22 @@
 		<dependency>
 			<groupId>com.netflix.eureka</groupId>
 			<artifactId>eureka-core</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>blitz4j</artifactId>
+					<groupId>com.netflix.blitz4j</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.archaius</groupId>
+			<artifactId>archaius-core</artifactId>
 		</dependency>
 		<!-- Eureka deps that are now optional in eureka -->
 		<dependency>
 			<groupId>com.thoughtworks.xstream</groupId>
 			<artifactId>xstream</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.netflix.blitz4j</groupId>
-			<artifactId>blitz4j</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java
index 3b621f15..f9d332ea 100644
--- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java
+++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java
@@ -20,7 +20,9 @@ import java.io.IOException;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.util.Properties;
 
+import javax.annotation.PostConstruct;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 
@@ -33,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.logging.LoggingSystem;
 import org.springframework.boot.logging.log4j.Log4JLoggingSystem;
 import org.springframework.cloud.netflix.eureka.DataCenterAwareMarshallingStrategy;
 import org.springframework.cloud.netflix.eureka.DiscoveryManagerInitializer;
@@ -49,9 +52,12 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.support.PropertiesLoaderUtils;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.web.context.ServletContextAware;
 
+import com.netflix.blitz4j.DefaultBlitz4jConfig;
 import com.netflix.blitz4j.LoggingConfiguration;
 import com.netflix.discovery.converters.JsonXStream;
 import com.netflix.discovery.converters.XmlXStream;
@@ -89,6 +95,36 @@ public class EurekaServerInitializerConfiguration implements ServletContextAware
 		this.servletContext = servletContext;
 	}
 
+	@PostConstruct
+	public void initLogging() {
+
+		if (!(LoggingSystem.get(ClassUtils.getDefaultClassLoader()) instanceof Log4JLoggingSystem)) {
+
+			LoggingConfiguration off = new LoggingConfiguration() {
+				@Override
+				public void configure() {
+				}
+			};
+			Field instance = ReflectionUtils.findField(LoggingConfiguration.class,
+					"instance");
+			ReflectionUtils.makeAccessible(instance);
+			ReflectionUtils.setField(instance, null, off);
+			Field blitz4j = ReflectionUtils.findField(LoggingConfiguration.class,
+					"blitz4jConfig");
+			ReflectionUtils.makeAccessible(blitz4j);
+			try {
+				Properties props = PropertiesLoaderUtils
+						.loadAllProperties(new ClassPathResource("log4j.properties",
+								Log4JLoggingSystem.class).toString());
+				DefaultBlitz4jConfig blit4jConfig = new DefaultBlitz4jConfig(props);
+				ReflectionUtils.setField(blitz4j, off, blit4jConfig);
+			}
+			catch (IOException e) {
+			}
+
+		}
+	}
+
 	@Bean
 	@ConditionalOnMissingBean(DiscoveryManagerInitializer.class)
 	public DiscoveryManagerInitializer discoveryManagerIntitializer() {