diff --git a/README.adoc b/README.adoc
index 452eeb5f6..af443d190 100644
--- a/README.adoc
+++ b/README.adoc
@@ -350,6 +350,9 @@ tracer.addTag(baggageKey, baggageValue);
 
 === Adding to the project
 
+IMPORTANT: To ensure that your application name is properly displayed in Zipkin
+ set the `spring.application.name` property in `bootstrap.yml`.
+
 ==== Only Sleuth (log correlation)
 
 If you want to profit only from Spring Cloud Sleuth without the Zipkin integration just add
diff --git a/docs/src/main/asciidoc/intro.adoc b/docs/src/main/asciidoc/intro.adoc
index 7549036c9..609c63765 100644
--- a/docs/src/main/asciidoc/intro.adoc
+++ b/docs/src/main/asciidoc/intro.adoc
@@ -229,6 +229,9 @@ tracer.addTag(baggageKey, baggageValue);
 
 === Adding to the project
 
+IMPORTANT: To ensure that your application name is properly displayed in Zipkin
+ set the `spring.application.name` property in `bootstrap.yml`.
+
 ==== Only Sleuth (log correlation)
 
 If you want to profit only from Spring Cloud Sleuth without the Zipkin integration just add