diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index 4e87eaf3..3ac3927c 100644
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -117,6 +117,8 @@ Ruby (debian packages ruby and rubygems)
 @item
 Vagrant (unpackaged, tested on v1.4.3)
 @item
+vagrant-cachier plugin (unpackaged): `vagrant plugin install vagrant-cachier`
+@item
 Paramiko (debian package python-paramiko)
 @item
 Imaging (debian package python-imaging)
diff --git a/makebuildserver b/makebuildserver
index 5eba8049..5b4862f3 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -170,6 +170,13 @@ for f, src, shasum in cachefiles:
 vagrantfile = """
 Vagrant.configure("2") do |config|
 
+  if Vagrant.has_plugin?("vagrant-cachier")
+    config.cache.scope = :box
+    config.cache.auto_detect = false
+    config.cache.enable :apt
+    config.cache.enable :chef
+  end
+
   config.vm.box = "{0}"
   config.vm.box_url = "{1}"