diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index cb0346447..26c8b6154 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -16,7 +16,7 @@
 	<properties>
 		<spring-cloud-netflix.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
 		<aspectj.version>1.8.4</aspectj.version>
-		<zipkin-java.version>0.16.1</zipkin-java.version>
+		<zipkin-java.version>0.17.1</zipkin-java.version>
 		<zipkin-ui.version>1.39.8</zipkin-ui.version>
 	</properties>
 	<dependencyManagement>
@@ -85,7 +85,7 @@
 			</dependency>
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
-				<artifactId>storage-jdbc</artifactId>
+				<artifactId>zipkin-storage-jdbc</artifactId>
 				<version>${zipkin-java.version}</version>
 			</dependency>
 			<dependency>
diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml
index 8297fd3b5..953bc8288 100644
--- a/spring-cloud-sleuth-samples/pom.xml
+++ b/spring-cloud-sleuth-samples/pom.xml
@@ -59,12 +59,12 @@
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin</artifactId>
-				<version>0.16.1</version>
+				<version>0.17.1</version>
 			</dependency>
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin-server</artifactId>
-				<version>0.16.1</version>
+				<version>0.17.1</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
diff --git a/spring-cloud-sleuth-zipkin-stream/pom.xml b/spring-cloud-sleuth-zipkin-stream/pom.xml
index 06458d755..6fc9823b5 100644
--- a/spring-cloud-sleuth-zipkin-stream/pom.xml
+++ b/spring-cloud-sleuth-zipkin-stream/pom.xml
@@ -63,7 +63,7 @@
 		</dependency>
 		<dependency>
 			<groupId>io.zipkin.java</groupId>
-			<artifactId>storage-jdbc</artifactId>
+			<artifactId>zipkin-storage-jdbc</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/HttpZipkinSpanReporter.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/HttpZipkinSpanReporter.java
index 9cbba9bfb..17fa56b06 100644
--- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/HttpZipkinSpanReporter.java
+++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/HttpZipkinSpanReporter.java
@@ -1,5 +1,6 @@
 package org.springframework.cloud.sleuth.zipkin;
 
+import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.Flushable;
 import java.io.IOException;
@@ -15,12 +16,12 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ScheduledExecutorService;
 
+import java.util.zip.GZIPOutputStream;
 import org.apache.commons.logging.Log;
 import org.springframework.cloud.sleuth.metric.SpanMetricReporter;
 
 import zipkin.Codec;
 import zipkin.Span;
-import zipkin.internal.Util;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 
@@ -134,7 +135,11 @@ public final class HttpZipkinSpanReporter
 		connection.addRequestProperty("Content-Type", "application/json");
 		if (this.compressionEnabled) {
 			connection.addRequestProperty("Content-Encoding", "gzip");
-			json = Util.gzip(json);
+			ByteArrayOutputStream gzipped = new ByteArrayOutputStream();
+			try (GZIPOutputStream compressor = new GZIPOutputStream(gzipped)) {
+				compressor.write(json);
+			}
+			json = gzipped.toByteArray();
 		}
 		connection.setDoOutput(true);
 		connection.setFixedLengthStreamingMode(json.length);