diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index 7657f7f3..dacf6cc9 100644
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -116,6 +116,8 @@ Ruby (debian packages ruby and rubygems)
 Vagrant (unpackaged) Be sure to use 1.3.x because 1.4.x is completely broken
 (at the time of writing, the forthcoming 1.4.3 might work)
 @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 7bf0e14d..95cd4144 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -146,6 +146,10 @@ for f, src, shasum in cachefiles:
 vagrantfile = """
 Vagrant::Config.run do |config|
 
+  if Vagrant.has_plugin?("vagrant-cachier")
+    config.cache.scope = :box
+  end
+
   config.vm.box = "{0}"
   config.vm.box_url = "{1}"