diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 000000000000..bc165fbcd305
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="intellij-third-party-dependencies" />
+      <option name="name" value="IntelliJ Dependencies on Bintray" />
+      <option name="url" value="https://jetbrains.bintray.com/intellij-third-party-dependencies" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/commons_imaging.xml b/.idea/libraries/commons_imaging.xml
index 217e8bf1608a..2bfaec012700 100644
--- a/.idea/libraries/commons_imaging.xml
+++ b/.idea/libraries/commons_imaging.xml
@@ -1,10 +1,14 @@
 <component name="libraryTable">
   <library name="commons-imaging" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.apache.commons:commons-imaging:1.0-SNAPSHOT" />
+    <properties maven-id="org.jetbrains.intellij.deps:commons-imaging:1.0-RC" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-imaging/1.0-SNAPSHOT/commons-imaging-1.0-SNAPSHOT.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/commons-imaging/1.0-RC/commons-imaging-1.0-RC.jar!/" />
     </CLASSES>
-    <JAVADOC />
-    <SOURCES />
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/commons-imaging/1.0-RC/commons-imaging-1.0-RC-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/commons-imaging/1.0-RC/commons-imaging-1.0-RC-sources.jar!/" />
+    </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
index bd3491e6f6e6..25bd63830390 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
@@ -75,8 +75,8 @@ class CommunityLibraryLicenses {
                        url: "http://commons.apache.org/net/"),
     new LibraryLicense(name: "Apache Lucene", libraryName: "lucene-core-2.4.1.jar", version: "2.4.1", license: "Apache 2.0",
                        url: "http://lucene.apache.org/java"),
-    new LibraryLicense(name: "Apache Commons Imaging", libraryName: "commons-imaging", version: "1.0-SNAPSHOT", license: "Apache 2.0",
-                       url: "https://commons.apache.org/proper/commons-imaging/"),
+    new LibraryLicense(name: "Apache Commons Imaging (JetBrains's fork)", libraryName: "commons-imaging", version: "1.0-RC", license: "Apache 2.0",
+                       url: "https://github.com/JetBrains/intellij-deps-commons-imaging"),
     new LibraryLicense(name: "Apache XML Graphics Commons", libraryName: "xmlgraphics-commons-1.3.1.jar", version: "1.3.1",
                        license: "Apache 2.0", url: "http://xmlgraphics.apache.org/commons/",
                        licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0"),