diff --git a/README.adoc b/README.adoc
index 5977475e..c95d15cf 100644
--- a/README.adoc
+++ b/README.adoc
@@ -135,6 +135,18 @@ The method getId() is undefined for the type ProxyRouteLocator.ProxyRouteSpec
 The method getLocation() is undefined for the type ProxyRouteLocator.ProxyRouteSpec PreDecorationFilter.java    /spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre line 55 Java Problem
 ----
 
+==== Importing into Intellij
+Spring Cloud projects use annotation processing, particularly Lombok, which requires configuration
+or you will encounter compile problems. It also needs a specific version of maven and a profile
+enabled. Intellij 14.1+ requires some configuration to ensure these are setup properly.
+
+ 1. Click Preferences, Plugins. *Ensure Lombok is installed*
+ 2. Click New, Project from Existing Sources, choose your spring-cloud-sleuth directory
+ 3. Choose Maven, and select Environment Settings. *Ensure you are using Maven 3.3.3*
+ 4. In the next screen, *Select the profile `spring`* click Next until Finish.
+ 5. Click Preferences, "Build, Execution, Deployment", Compiler, Annotation Processors. *Click Enable Annotation Processing*
+ 6. Click Build, Rebuild Project, and you are ready to go!
+
 ==== Importing into other IDEs
 Maven is well supported by most Java IDEs. Refer to you vendor documentation.
 
@@ -162,7 +174,7 @@ added after the original pull request but before a merge.
 * Use the Spring Framework code format conventions. If you use Eclipse
   you can import formatter settings using the
   `eclipse-code-formatter.xml` file from the
-  https://github.com/spring-cloud/build/tree/master/eclipse-coding-conventions.xml[Spring
+  https://github.com/spring-cloud/spring-cloud-build/blob/master/spring-cloud-build/eclipse-code-formatter.xml[Spring
   Cloud Build] project. If using IntelliJ, you can use the
   http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
   Plugin] to import the same file.