diff --git a/.idea/libraries/Guava.xml b/.idea/libraries/Guava.xml
index 3ca41301e3d2..3e87965823e4 100644
--- a/.idea/libraries/Guava.xml
+++ b/.idea/libraries/Guava.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Guava">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/guava-19.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/guava-21.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/guava-19.0-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/src/guava-21.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/build/groovy/org/jetbrains/intellij/build/IntelliJCoreArtifactsBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/IntelliJCoreArtifactsBuilder.groovy
index 0decc28762eb..807dcf93ee33 100644
--- a/build/groovy/org/jetbrains/intellij/build/IntelliJCoreArtifactsBuilder.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/IntelliJCoreArtifactsBuilder.groovy
@@ -97,7 +97,7 @@ class IntelliJCoreArtifactsBuilder {
 
         ant.fileset(dir: "$home/lib") {
           include(name: "asm-all.jar")
-          include(name: "guava-19.0.jar")
+          include(name: "guava-21.0.jar")
           include(name: "picocontainer.jar")
           include(name: "trove4j.jar")
           include(name: "cli-parser-1.1.jar")
diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/StaticPseudoFunctionalStyleMethodTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/StaticPseudoFunctionalStyleMethodTest.java
index 97728d5efa58..68a2176f68f5 100644
--- a/java/java-tests/testSrc/com/intellij/codeInspection/StaticPseudoFunctionalStyleMethodTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/StaticPseudoFunctionalStyleMethodTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,10 +39,10 @@ public class StaticPseudoFunctionalStyleMethodTest extends JavaCodeInsightFixtur
   @Override
   protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) throws Exception {
     moduleBuilder.setLanguageLevel(LanguageLevel.JDK_1_8);
-    moduleBuilder.addLibraryJars("guava-19.0.jar", PathManager.getHomePath().replace(File.separatorChar, '/') + "/community/lib/",
-                                 "guava-19.0.jar");
-    moduleBuilder.addLibraryJars("guava-19.0.jar-2", PathManager.getHomePath().replace(File.separatorChar, '/') + "/lib/",
-                                 "guava-19.0.jar");
+    moduleBuilder.addLibraryJars("guava-21.0.jar", PathManager.getHomePath().replace(File.separatorChar, '/') + "/community/lib/",
+                                 "guava-21.0.jar");
+    moduleBuilder.addLibraryJars("guava-21.0.jar-2", PathManager.getHomePath().replace(File.separatorChar, '/') + "/lib/",
+                                 "guava-21.0.jar");
     moduleBuilder.addJdk(IdeaTestUtil.getMockJdk18Path().getPath());
   }
 
diff --git a/java/typeMigration/test/com/intellij/codeInsight/inspections/GuavaInspectionTest.java b/java/typeMigration/test/com/intellij/codeInsight/inspections/GuavaInspectionTest.java
index 2519e6aba5f2..a638b12c1c98 100644
--- a/java/typeMigration/test/com/intellij/codeInsight/inspections/GuavaInspectionTest.java
+++ b/java/typeMigration/test/com/intellij/codeInsight/inspections/GuavaInspectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@ public class GuavaInspectionTest extends JavaCodeInsightFixtureTestCase {
   @Override
   protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) throws Exception {
     moduleBuilder.setLanguageLevel(LanguageLevel.JDK_1_8);
-    moduleBuilder.addLibraryJars("guava", PathManager.getHomePathFor(Assert.class) + "/lib/", "guava-19.0.jar");
+    moduleBuilder.addLibraryJars("guava", PathManager.getHomePathFor(Assert.class) + "/lib/", "guava-21.0.jar");
     moduleBuilder.addLibraryJars("jsr305", PathManager.getHomePathFor(Assert.class) + "/lib/", "jsr305.jar");
     moduleBuilder.addJdk(IdeaTestUtil.getMockJdk18Path().getPath());
   }
diff --git a/lib/guava-19.0.jar b/lib/guava-19.0.jar
deleted file mode 100644
index b175ca867fe4..000000000000
Binary files a/lib/guava-19.0.jar and /dev/null differ
diff --git a/lib/guava-21.0.jar b/lib/guava-21.0.jar
new file mode 100644
index 000000000000..0618195945f1
Binary files /dev/null and b/lib/guava-21.0.jar differ
diff --git a/lib/src/guava-19.0-sources.jar b/lib/src/guava-19.0-sources.jar
deleted file mode 100644
index 633c3157dcb9..000000000000
Binary files a/lib/src/guava-19.0-sources.jar and /dev/null differ
diff --git a/lib/src/guava-21.0-sources.jar b/lib/src/guava-21.0-sources.jar
new file mode 100644
index 000000000000..d594f765764f
Binary files /dev/null and b/lib/src/guava-21.0-sources.jar differ
diff --git a/python/src/com/jetbrains/python/toolbox/ChainIterable.java b/python/src/com/jetbrains/python/toolbox/ChainIterable.java
index 6f35bab9d853..bff73df7c6b5 100644
--- a/python/src/com/jetbrains/python/toolbox/ChainIterable.java
+++ b/python/src/com/jetbrains/python/toolbox/ChainIterable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package com.jetbrains.python.toolbox;
 
-import com.google.common.collect.Iterators;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -85,7 +85,7 @@ public class ChainIterable<T> extends ChainedListBase<Iterable<T>> implements It
   private static class ChainIterator<T> implements Iterator<T> {
   
     private ChainedListBase<Iterable<T>> myLink; // link of the chain we're currently at
-    @NotNull private Iterator<T> myCurrent = Iterators.emptyIterator();
+    @NotNull private Iterator<T> myCurrent = ContainerUtil.emptyIterator();
   
     public ChainIterator(@Nullable ChainedListBase<Iterable<T>> initial) {
       myLink = initial;