diff --git a/zipkin/src/main/java/demo/ZipkinApplication.java b/zipkin/src/main/java/demo/ZipkinApplication.java
index fa3187d..5616ac7 100644
--- a/zipkin/src/main/java/demo/ZipkinApplication.java
+++ b/zipkin/src/main/java/demo/ZipkinApplication.java
@@ -1,27 +1,35 @@
 package demo;
 
+import io.zipkin.Span;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.sleuth.sampler.AlwaysSampler;
+import org.springframework.cloud.sleuth.zipkin.ZipkinSpanReporter;
 import org.springframework.context.annotation.Bean;
 
-import com.github.kristofa.brave.LoggingSpanCollector;
-import com.github.kristofa.brave.SpanCollector;
-
 @SpringBootApplication
 public class ZipkinApplication {
 
+	private static Logger log = LoggerFactory.getLogger(ZipkinApplication.class);
+
 	@Bean
 	public AlwaysSampler alwaysSampler() {
 		return new AlwaysSampler();
 	}
 
-	// Use this for debugging (or if there is no Zipkin collector running on port 9410)
+	// Use this for debugging (or if there is no Zipkin server running on port 9411)
 	@Bean
-	@ConditionalOnProperty(value="sample.zipkin.enabled", havingValue="false", matchIfMissing=true)
-	public SpanCollector spanCollector() {
-		return new LoggingSpanCollector();
+	@ConditionalOnProperty(value="sample.zipkin.enabled", havingValue="false")
+	public ZipkinSpanReporter spanCollector() {
+		return new ZipkinSpanReporter() {
+			@Override
+			public void report(Span span) {
+				log.info("Reporting span [{}]", span);
+			}
+		};
 	}
 
 	public static void main(String[] args) {