diff --git a/.gitignore b/.gitignore
index 01473f3d2601..4afa474a60b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,8 @@
 .DS_Store
 .classpath
 /build
-**/.idea/
+.idea/*
+!.idea/vcs.xml
 /logs
 *target/
 *.orig
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 000000000000..37214331c392
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+  <component name="IssueNavigationConfiguration">
+    <option name="links">
+      <list>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="HBASE\-\d+" />
+          <option name="linkRegexp" value="https://issues.apache.org/jira/browse/$0" />
+        </IssueNavigationLink>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="#(\d+)"/>
+          <option name="linkRegexp" value="https://github.com/apache/hbase/pull/$1"/>
+        </IssueNavigationLink>
+      </list>
+    </option>
+  </component>
+</project>