diff --git a/.idea/libraries/StreamEx.xml b/.idea/libraries/StreamEx.xml
new file mode 100644
index 000000000000..023f7051bc85
--- /dev/null
+++ b/.idea/libraries/StreamEx.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="StreamEx">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/streamex-0.6.2.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/lib/src/streamex-0.6.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/build/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy b/build/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
index d3ca513a0e03..849376703e09 100644
--- a/build/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
@@ -339,6 +339,8 @@ class CommunityLibraryLicenses {
                        url: "http://sphinxcontrib-napoleon.readthedocs.org/"),
     new LibraryLicense(name: "sqljet", version: "bundled with SVNKit", libraryName: "sqljet.jar", license: "link (commercial license)",
                        url: "http://sqljet.com", licenseUrl: "http://svnkit.com/license.html"),
+    new LibraryLicense(name: "StreamEx", version: "0.6.2", libraryName: "StreamEx", license: "Apache 2.0",
+                       url: "https://github.com/amaembo/streamex", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0"),
     new LibraryLicense(name: "svnkit-javahl", version: "bundled with SVNKit", libraryName: "svnkit-javahl.jar",
                        license: "link (commercial license)", url: "http://www.svnkit.com/", licenseUrl: "http://svnkit.com/license.html"),
     new LibraryLicense(name: "SVNKit", libraryName: "svnkit.jar", version: "1.8.12", license: "link (commercial license)",
diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt
index 42f39389b241..99071bf0d0ac 100644
--- a/lib/required_for_dist.txt
+++ b/lib/required_for_dist.txt
@@ -68,6 +68,7 @@ sqlite-jdbc-3.6.20.1.jar
 swingx-core-1.6.2.jar
 slf4j-api-1.7.10.jar
 slf4j-log4j12-1.7.10.jar
+streamex-0.6.2.jar
 trove4j.jar
 velocity.jar
 winp-1.23.jar
diff --git a/lib/src/streamex-0.6.2-sources.jar b/lib/src/streamex-0.6.2-sources.jar
new file mode 100644
index 000000000000..634616f11a6e
Binary files /dev/null and b/lib/src/streamex-0.6.2-sources.jar differ
diff --git a/lib/streamex-0.6.2.jar b/lib/streamex-0.6.2.jar
new file mode 100644
index 000000000000..7609cf54edf9
Binary files /dev/null and b/lib/streamex-0.6.2.jar differ
diff --git a/platform/platform-impl/platform-impl.iml b/platform/platform-impl/platform-impl.iml
index 7ff596644cb6..84f591598820 100644
--- a/platform/platform-impl/platform-impl.iml
+++ b/platform/platform-impl/platform-impl.iml
@@ -47,5 +47,6 @@
     <orderEntry type="library" name="com.twelvemonkeys.imageio:imageio-tiff:3.2.1" level="project" />
     <orderEntry type="library" name="pty4j" level="project" />
     <orderEntry type="module" module-name="credential-store" scope="RUNTIME" />
+    <orderEntry type="library" exported="" name="StreamEx" level="project" />
   </component>
 </module>
\ No newline at end of file