diff --git a/.idea/libraries/Guava.xml b/.idea/libraries/Guava.xml
index 3e87965823e4..dae48db13f9b 100644
--- a/.idea/libraries/Guava.xml
+++ b/.idea/libraries/Guava.xml
@@ -1,11 +1,12 @@
 <component name="libraryTable">
-  <library name="Guava">
+  <library name="Guava" type="repository">
+    <properties maven-id="com.google.guava:guava:21.0" />
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/guava-21.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/21.0/guava-21.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/guava-21.0-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/21.0/guava-21.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/build/dependencies/setupBuildScriptsDeps.gradle b/build/dependencies/setupBuildScriptsDeps.gradle
index fa1a2ec0ce38..b688134b689f 100644
--- a/build/dependencies/setupBuildScriptsDeps.gradle
+++ b/build/dependencies/setupBuildScriptsDeps.gradle
@@ -34,6 +34,7 @@ dependencies {
   buildScriptsDeps loadLibraryMavenId("commons-logging")
   buildScriptsDeps loadLibraryMavenId("Trove4j")
   buildScriptsDeps loadLibraryMavenId("NanoXML")
+  buildScriptsDeps loadLibraryMavenId("Guava")
 }
 
 /**
diff --git a/build/gant.xml b/build/gant.xml
index 9b56ed4d2fd4..c7a81b2ce857 100644
--- a/build/gant.xml
+++ b/build/gant.xml
@@ -42,7 +42,6 @@
         <include name="netty*.jar"/>
         <include name="asm-all.jar"/>
         <include name="jgoodies-forms.jar"/>
-        <include name="guava*.jar"/>
         <include name="picocontainer.jar"/>
         <include name="jna.jar"/>
         <include name="jna-platform.jar"/>
diff --git a/lib/guava-21.0.jar b/lib/guava-21.0.jar
deleted file mode 100644
index 8f7e0e924153..000000000000
Binary files a/lib/guava-21.0.jar and /dev/null differ
diff --git a/lib/src/guava-21.0-sources.jar b/lib/src/guava-21.0-sources.jar
deleted file mode 100644
index d594f765764f..000000000000
Binary files a/lib/src/guava-21.0-sources.jar and /dev/null differ