diff --git a/.gitignore b/.gitignore
index a8ac70c4c..aca27e181 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,8 @@ _site/
 *.iml
 *.ipr
 *.iws
-.idea
+.idea/*
+!.idea/copyright/
 .factorypath
 spring-xd-samples/*/xd
 dump.rdb
diff --git a/.idea/copyright/ASF.xml b/.idea/copyright/ASF.xml
new file mode 100644
index 000000000..0072c5489
--- /dev/null
+++ b/.idea/copyright/ASF.xml
@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="myName" value="ASF" />
+    <option name="notice" value="Copyright &amp;#36;{today.year} the original author or authors.&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;     http://www.apache.org/licenses/LICENSE-2.0&#10;     &#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
+  </copyright>
+</component>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 000000000..a3afb3455
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+<component name="CopyrightManager">
+  <settings default="ASF" />
+</component>
\ No newline at end of file