diff --git a/astrid/.classpath b/astrid/.classpath
index 5f04b5c4a..cb5ae8bc5 100644
--- a/astrid/.classpath
+++ b/astrid/.classpath
@@ -29,5 +29,6 @@
 	<classpathentry kind="lib" path="libs/crittercism_v1_2_5.jar"/>
 	<classpathentry kind="lib" path="libs/jchronic-0.2.3.jar"/>
 	<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
+	<classpathentry kind="lib" path="libs/guava-11.0.1.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/astrid/build.xml b/astrid/build.xml
index fb47786e4..ec154dca3 100644
--- a/astrid/build.xml
+++ b/astrid/build.xml
@@ -54,7 +54,7 @@
 <!-- extension targets. Uncomment the ones where you want to do custom work
      in between standard targets -->
 
-    <target name="-pre-build" depends="get-version, copy-sources, updatekeys, updatekeys-release, disable-market">
+    <target name="-pre-build" depends="clean, get-version, copy-sources, updatekeys, updatekeys-release, disable-market">
       <mkdir dir="gen" />
     </target>
 
diff --git a/astrid/libs/guava-11.0.1.jar b/astrid/libs/guava-11.0.1.jar
new file mode 100644
index 000000000..af4a383ef
Binary files /dev/null and b/astrid/libs/guava-11.0.1.jar differ
diff --git a/astrid/proguard.cfg b/astrid/proguard.cfg
index 3ecbb315e..36b45c65f 100644
--- a/astrid/proguard.cfg
+++ b/astrid/proguard.cfg
@@ -10,6 +10,7 @@
 -keepattributes SourceFile, SourceDir, LineNumberTable, LocalVariableTable, LocalVariableTypeTable
 -keep, allowshrinking, allowoptimization class com.todoroo.**
 -keep class com.mdimension.**
+-keep class com.google.common.base.**
 
 # ignore reflection-based access from google libraries
 -dontwarn com.google.**