diff --git a/Vagrantfile b/Vagrantfile
index 2d310a943..a2a4e7d9c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -47,6 +47,7 @@ Vagrant::configure("2") do |config|
   end
 
   config.vm.define "build", autostart: false do |vm|
+    vm.vm.provision :shell, :inline => "apt-get -qq -y install git > /dev/null && cd /root/dokku && #{make_cmd}"
     vm.vm.provision :shell, :inline => "cd /root/dokku && make deb-all"
   end
 
diff --git a/deb.mk b/deb.mk
index 13357eef6..6e3f5917d 100644
--- a/deb.mk
+++ b/deb.mk
@@ -101,7 +101,9 @@ deb-dokku: deb-setup
 	cp dokku /tmp/build/usr/local/bin
 	cp -r plugins /tmp/build/var/lib/dokku
 	find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do touch /tmp/build/var/lib/dokku/plugins/$$plugin/.core; done
-	cp dokku.1 /tmp/build/usr/local/share/man/man1/dokku.1
+	$(MAKE) help2man
+	$(MAKE) addman
+	cp /usr/local/share/man/man1/dokku.1 /tmp/build/usr/local/share/man/man1/dokku.1
 	cp contrib/dokku-installer.rb /tmp/build/usr/local/share/dokku/contrib
 	git describe --tags > /tmp/build/var/lib/dokku/VERSION
 	cat /tmp/build/var/lib/dokku/VERSION | cut -d '-' -f 1 | cut -d 'v' -f 2 > /tmp/build/var/lib/dokku/STABLE_VERSION