diff --git a/.idea/libraries/Log4J.xml b/.idea/libraries/Log4J.xml
index 588f22548b1e..01c4dc7924d8 100644
--- a/.idea/libraries/Log4J.xml
+++ b/.idea/libraries/Log4J.xml
@@ -1,11 +1,12 @@
 <component name="libraryTable">
-  <library name="Log4J">
+  <library name="Log4J" type="repository">
+    <properties maven-id="log4j:log4j:1.2.17" />
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/log4j.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.17/log4j-1.2.17.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/log4j.zip!/java" />
+      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.17/log4j-1.2.17-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/build/dependencies/setupBuildScriptsDeps.gradle b/build/dependencies/setupBuildScriptsDeps.gradle
index 9447d4a8d481..96275d72fdfa 100644
--- a/build/dependencies/setupBuildScriptsDeps.gradle
+++ b/build/dependencies/setupBuildScriptsDeps.gradle
@@ -25,6 +25,7 @@ dependencies {
   buildScriptsDeps loadLibraryMavenId("Netty")
   buildScriptsDeps loadLibraryMavenId("lz4-java")
   buildScriptsDeps(loadLibraryMavenId("gant-groovy"), { transitive = false })
+  buildScriptsDeps loadLibraryMavenId("Log4J")
 }
 
 /**
diff --git a/build/gant.xml b/build/gant.xml
index a3fcefe47479..aec60a64fe3f 100644
--- a/build/gant.xml
+++ b/build/gant.xml
@@ -34,7 +34,6 @@
       </fileset>
       <fileset dir="${idea.lib}">
         <include name="jdom.jar"/>
-        <include name="log4j.jar"/>
         <include name="asm-all.jar"/>
         <include name="jgoodies-forms.jar"/>
         <include name="picocontainer.jar"/>
diff --git a/lib/log4j.jar b/lib/log4j.jar
deleted file mode 100644
index 068867ebfd23..000000000000
Binary files a/lib/log4j.jar and /dev/null differ
diff --git a/lib/src/log4j.zip b/lib/src/log4j.zip
deleted file mode 100644
index 0f5e5a6cc897..000000000000
Binary files a/lib/src/log4j.zip and /dev/null differ
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy
index c693d543b50d..83e586fef3f9 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy
@@ -141,6 +141,7 @@ class DistributionJARsBuilder {
       }
       withProjectLibrariesFromIncludedModules(buildContext)
       removeVersionFromProjectLibraryJarNames("Trove4j")
+      removeVersionFromProjectLibraryJarNames("Log4J")
     }
   }