diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
new file mode 100644
index 00000000000..a5d2ae184a5
--- /dev/null
+++ b/.idea/checkstyle-idea.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CheckStyle-IDEA">
+    <option name="configuration">
+      <map>
+        <entry key="active-configuration" value="PROJECT_RELATIVE:$PROJECT_DIR$/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml:HBase Checks" />
+        <entry key="checkstyle-version" value="6.18" />
+        <entry key="copy-libs" value="false" />
+        <entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
+        <entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
+        <entry key="location-2" value="PROJECT_RELATIVE:$PROJECT_DIR$/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml:HBase Checks" />
+        <entry key="scan-before-checkin" value="false" />
+        <entry key="scanscope" value="JavaOnlyWithTests" />
+        <entry key="suppress-errors" value="false" />
+      </map>
+    </option>
+  </component>
+</project>
diff --git a/pom.xml b/pom.xml
index 8601dea6a21..649e71cb583 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1302,6 +1302,9 @@
     <jamon.plugin.version>2.4.1</jamon.plugin.version>
     <findbugs-annotations>1.3.9-1</findbugs-annotations>
     <findbugs.maven.version>3.0.4</findbugs.maven.version>
+    <!--
+      When updating checkstyle.version, please make the same change in `.idea/checkstyle-idea.xml`
+    -->
     <checkstyle.version>6.18</checkstyle.version>
     <asciidoctor.plugin.version>1.5.3</asciidoctor.plugin.version>
     <plexus.errorprone.javac.version>2.8.2</plexus.errorprone.javac.version>