diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index b9a47721ad17..0af4a6b4618e 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -717,6 +717,7 @@ def layoutCommunityJps(String home, String target) {
       include(name: "log4j.jar")
       include(name: "jgoodies-forms.jar")
       include(name: "ecj*.jar")
+      include(name: "jsr166e.jar")
     }
     dir("test") {
       jar("jps-build-test.jar") {
diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java
index c6cc1173e0d3..d2b4c7f3210b 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java
@@ -146,6 +146,7 @@ public class ClasspathBootstrap {
     cp.add(getResourcePath(NotNullVerifyingInstrumenter.class));  // not-null
     cp.add(getResourcePath(IXMLBuilder.class));  // nano-xml
     cp.add(getResourcePath(SequenceLock.class));  // jsr166
+    //don't forget to update layoutCommunityJps() in layouts.gant accordingly
 
     if (!isLauncherUsed) {
       appendJavaCompilerClasspath(cp);