diff --git a/.idea/libraries/intellij_core.xml b/.idea/libraries/intellij_core.xml
index 4341c3d263e..ab8138027e6 100644
--- a/.idea/libraries/intellij_core.xml
+++ b/.idea/libraries/intellij_core.xml
@@ -2,6 +2,7 @@
   <library name="intellij-core">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/ideaSDK/core" />
+      <root url="jar://$PROJECT_DIR$/dependencies/cli-parser-1.1.1.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
@@ -249,6 +250,7 @@
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/testFramework/java-production" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/testFramework-java/java-production" />
       <root url="jar://$PROJECT_DIR$/ideaSDK/sources/sources.zip!/.jps-build-data/groovyStubs/jps-standalone-builder/java-production" />
+      <root url="jar://$PROJECT_DIR$/dependencies/cli-parser-1.1.1-sources.jar!/" />
     </SOURCES>
     <jarDirectory url="file://$PROJECT_DIR$/ideaSDK/core" recursive="false" />
   </library>
diff --git a/build.xml b/build.xml
index 7fcfe6e45f1..073b019b38e 100644
--- a/build.xml
+++ b/build.xml
@@ -19,6 +19,7 @@
         <fileset dir="${basedir}/lib" includes="**/*.jar"/>
         <fileset dir="${basedir}/dependencies" includes="jline.jar"/>
         <fileset dir="${basedir}/dependencies" includes="jansi.jar"/>
+        <fileset dir="${basedir}/dependencies" includes="cli-parser-1.1.1.jar"/>
         <fileset dir="${basedir}/js/js.translator/lib" includes="*.jar"/>
     </path>
 
@@ -247,6 +248,7 @@
               <zipgroupfileset dir="${basedir}/ideaSDK/lib" includes="protobuf-2.5.0.jar"/>
               <zipgroupfileset dir="${basedir}/js/js.translator/lib" includes="*.jar"/>
               <zipgroupfileset dir="${basedir}/dependencies" includes="jline.jar"/>
+              <zipgroupfileset dir="${basedir}/dependencies" includes="cli-parser-1.1.1.jar"/>
 
               <manifest>
                   <attribute name="Built-By" value="JetBrains"/>
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 181ca5bcd37..2ee3a18b9fd 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -143,6 +143,9 @@
 
         <!-- Protocol Buffers -->
         <get-maven-library prefix="com/google/protobuf" lib="protobuf-java" version="2.5.0" bin="false"/>
+
+        <!-- CLI Parser -->
+        <get-maven-library prefix="com/github/spullara/cli-parser" lib="cli-parser" version="1.1.1"/>
     </target>
 
     <macrodef name="get-asm4-and-rename-packages">
@@ -198,7 +201,6 @@
                     <mkdir dir="${jps-test}"/>
                     <get src="@{base.url.for.core}/core/intellij-core.jar" dest="${core}/intellij-core.jar" usetimestamp="true"/>
                     <get src="@{base.url}/core/annotations.jar" dest="${core}/annotations.jar" usetimestamp="true"/>
-                    <get src="@{base.url}/core/cli-parser-1.1.jar" dest="${core}/cli-parser-1.1.jar" usetimestamp="true"/>
                     <get src="@{base.url}/core/guava-14.0.1.jar" dest="${core}/guava-14.0.1.jar" usetimestamp="true"/>
                     <get src="@{base.url}/core/picocontainer.jar" dest="${core}/picocontainer.jar" usetimestamp="true"/>
                     <get src="@{base.url}/core/trove4j.jar" dest="${core}/trove4j.jar" usetimestamp="true"/>