diff --git a/metadata/at.bitfire.davdroid.txt b/metadata/at.bitfire.davdroid.txt
index 2a161f2379..5e996512d9 100644
--- a/metadata/at.bitfire.davdroid.txt
+++ b/metadata/at.bitfire.davdroid.txt
@@ -143,9 +143,16 @@ Build:0.6.9.2,50
     commit=v0.6.9.2
     gradle=yes
     subdir=app
-    disable=jar file for broken upstream
+    rm=app/lib/*
+    srclibs=ApacheHttpClientAndroid@1648631
+    prebuild=pushd $$ApacheHttpClientAndroid$$ && gradle build && popd && cp $$ApacheHttpClientAndroid$$/build/libs/httpclient-android-4.3.5.1-SNAPSHOT.jar lib/httpclient-android-4.3.5.davdroid1.jar
 
-Auto Update Mode:Version v%v
+Maintainer Notes:
+* 0.6.9.2 builds locally but will probably break on the BS.
+* Reset AUM once httpclient 4.3.5.1 is released and used.
+.
+
+#Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Current Version:0.6.9.2
 Current Version Code:50
diff --git a/srclibs/ApacheHttpClientAndroid.txt b/srclibs/ApacheHttpClientAndroid.txt
new file mode 100644
index 0000000000..f4f705d636
--- /dev/null
+++ b/srclibs/ApacheHttpClientAndroid.txt
@@ -0,0 +1,2 @@
+Repo Type:git-svn
+Repo:https://svn.apache.org/repos/asf/httpcomponents/httpclient-android/branches/4.3.5-android/