diff --git a/Makefile b/Makefile
index 20f711a66b..fdff9a0389 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,10 @@
-setup:
+jar:
 	git submodule init
 	git submodule update
 	cd library/volley && ant jar
 	cp library/volley/bin/volley.jar library/libs
+	cd library && ant jar
+
+glide-minus-volley:
+	cd library && ant glide-minus-volley
 
-update-ant: setup
-	android update project --path .. --library glide/library
diff --git a/library/build.xml b/library/build.xml
index 2f8d9f242b..a6e9e0030c 100644
--- a/library/build.xml
+++ b/library/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="photos" default="help">
+<project name="glide" default="help">
 
   <!-- The local.properties file is created and updated by the 'android' tool.
        It contains the path to the SDK. It should *NOT* be checked into
diff --git a/library/custom_rules.xml b/library/custom_rules.xml
new file mode 100644
index 0000000000..8b0ac313e6
--- /dev/null
+++ b/library/custom_rules.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="glide-rules" default="help">
+    <target name="jar" depends="-compile">
+        <jar destfile="bin/glide.jar"
+            basedir="bin/classes" >
+            <zipgroupfileset dir="libs" includes="*.jar" />
+        </jar>
+    </target>
+    <target name="glide-minus-volley" depends="-compile">
+        <jar destfile="bin/glide-minus-volley.jar"
+            basedir="bin/classes" >
+            <zipgroupfileset dir="libs" includes="disklrucache*.jar" />
+        </jar>
+    </target>
+</project>
diff --git a/library/project.properties b/library/project.properties
index b2ed0b007a..6dc8099a8e 100644
--- a/library/project.properties
+++ b/library/project.properties
@@ -10,6 +10,8 @@
 # To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
-android.library=true
 # Project target.
 target=android-16
+
+# https://code.google.com/p/android/issues/detail?id=40487
+renderscript.opt.level=O0