diff --git a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
index 0764eb23..8587f3d9 100644
--- a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
+++ b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
@@ -19,26 +19,25 @@ if node['kernel']['machine'] == "x86_64"
   end
 end
 
-script "install-gradle" do
+script "add-gradle-dir" do
   cwd "/tmp"
   interpreter "bash"
-  code "
-    unzip /vagrant/cache/gradle-1.9-bin.zip
-    mv gradle-1.9 /opt/gradle
-  "
+  code "mkdir -p /opt/gradle"
   not_if "test -d /opt/gradle"
 end
 
-execute "add-gradle-home" do
-  user user
-  command "echo \"export GRADLE_HOME=/opt/gradle\" >> /home/#{user}/.bsenv"
-  not_if "grep GRADLE_HOME /home/#{user}/.bsenv"
-end
-execute "add-gradle-bin" do
-  user user
-  command "echo \"export PATH=\\$PATH:/opt/gradle/bin\" >> /home/#{user}/.bsenv"
-  not_if "grep gradle/bin /home/#{user}/.bsenv"
+%w{1.4 1.6 1.7 1.8 1.9}.each do |ver|
+  script "install-gradle-#{ver}" do
+    cwd "/tmp"
+    interpreter "bash"
+    code "
+      unzip /vagrant/cache/gradle-#{ver}-bin.zip
+      mv gradle-#{ver} /opt/gradle/#{ver}
+    "
+    not_if "test -d /opt/gradle/#{ver}"
+  end
 end
+
 execute "add-bsenv" do
   user user
   command "echo \". ./.bsenv \" >> /home/#{user}/.bashrc"
diff --git a/makebuildserver b/makebuildserver
index 8235577a..96443a72 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -62,6 +62,18 @@ cachefiles = [
     ('android-sdk_r22.3-linux.tgz',
      'http://dl.google.com/android/android-sdk_r22.3-linux.tgz',
      '4077575c98075480e0156c10e48a1521e31c7952768271a206870e6813057f4f'),
+    ('gradle-1.4-bin.zip',
+     'http://services.gradle.org/distributions/gradle-1.4-bin.zip',
+     'cd99e85fbcd0ae8b99e81c9992a2f10cceb7b5f009c3720ef3a0078f4f92e94e'),
+    ('gradle-1.6-bin.zip',
+     'http://services.gradle.org/distributions/gradle-1.6-bin.zip',
+     'de3e89d2113923dcc2e0def62d69be0947ceac910abd38b75ec333230183fac4'),
+    ('gradle-1.7-bin.zip',
+     'http://services.gradle.org/distributions/gradle-1.7-bin.zip',
+     '360c97d51621b5a1ecf66748c718594e5f790ae4fbc1499543e0c006033c9d30'),
+    ('gradle-1.8-bin.zip',
+     'http://services.gradle.org/distributions/gradle-1.8-bin.zip',
+     'a342bbfa15fd18e2482287da4959588f45a41b60910970a16e6d97959aea5703'),
     ('gradle-1.9-bin.zip',
      'http://services.gradle.org/distributions/gradle-1.9-bin.zip',
      '097ddc2bcbc9da2bb08cbf6bf8079585e35ad088bafd42e8716bc96405db98e9'),