diff --git a/docker-compose-zipkin.yml b/docker-compose-zipkin.yml
new file mode 100644
index 0000000..6e660c1
--- /dev/null
+++ b/docker-compose-zipkin.yml
@@ -0,0 +1,36 @@
+version: '2'
+
+services:
+  shipping:
+    image: weaveworksdemos/shipping
+    hostname: shipping
+    restart: always
+    cap_drop:
+      - all
+    cap_add:
+      - NET_BIND_SERVICE
+    read_only: true
+    tmpfs:
+      - /tmp:rw,noexec,nosuid
+    environment:
+      - reschedule=on-node-failure
+      - ZIPKIN=zipkin
+    ports:
+      - "8080:80"
+  zipkin:
+    image: openzipkin/zipkin 
+    hostname: zipkin
+    restart: always
+    cap_drop:
+      - all
+    cap_add:
+      - CHOWN
+      - SETGID
+      - SETUID
+    read_only: true
+    tmpfs:
+      - /tmp:rw,noexec,nosuid
+    environment:
+      - reschedule=on-node-failure
+    ports:
+      - "9411:9411"
diff --git a/pom.xml b/pom.xml
index b9b7a16..3da5a30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+	<dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zipkin</artifactId>
+            <version>1.1.0.RELEASE</version>
+        </dependency>
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>simpleclient</artifactId>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 77d83ef..bda9f69 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,2 +1,5 @@
 server.port=${port:8080}
 endpoints.health.enabled=false
+spring.zipkin.baseUrl=http://${zipkin:zipkin}:9411/
+spring.sleuth.sampler.percentage=1.0
+spring.application.name=shipping