diff --git a/CHANGES.txt b/CHANGES.txt
index c978d53245..1eca920152 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.5
+ * Add generate-idea-files target to build.xml (CASSANDRA-9123)
* Do not load read meter for offline operations (CASSANDRA-9082)
* cqlsh: Make CompositeType data readable (CASSANDRA-8919)
* cqlsh: Fix display of triggers (CASSANDRA-9081)
diff --git a/build.xml b/build.xml
index 684ace1b86..974456412d 100644
--- a/build.xml
+++ b/build.xml
@@ -1483,6 +1483,212 @@
]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+]]>
+
+ Apache Cassandra ${eclipse.project.name}
+
+
+
+
+
+
+
+]]>
+
+
+
+]]>
+
+
+
+
+
+]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ]]>
+
+
+
diff --git a/ide/idea/ant.xml b/ide/idea/ant.xml
new file mode 100644
index 0000000000..a2a4769827
--- /dev/null
+++ b/ide/idea/ant.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ide/idea/codeStyleSettings.xml b/ide/idea/codeStyleSettings.xml
new file mode 100644
index 0000000000..d9190a7c04
--- /dev/null
+++ b/ide/idea/codeStyleSettings.xml
@@ -0,0 +1,275 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ide/idea/copyright/Apache_License_2_0.xml b/ide/idea/copyright/Apache_License_2_0.xml
new file mode 100644
index 0000000000..e83c1c184c
--- /dev/null
+++ b/ide/idea/copyright/Apache_License_2_0.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ide/idea/copyright/profiles_settings.xml b/ide/idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000000..5448281ad9
--- /dev/null
+++ b/ide/idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/ide/idea/inspectionProfiles/Project_Default.xml b/ide/idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000000..aa640e864d
--- /dev/null
+++ b/ide/idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,153 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ide/idea/inspectionProfiles/profiles_settings.xml b/ide/idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000000..3b312839bf
--- /dev/null
+++ b/ide/idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file