diff --git a/Vagrantfile b/Vagrantfile
index a975a01bc1..9d5d70e601 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -40,7 +40,11 @@ Vagrant.configure("2") do |config|
   if Vagrant.has_plugin?("vagrant-timezone")
     config.timezone.value = :host
   end
-  config.vm.synced_folder HOME, HOME, type: MOUNT_TYPE
+  if "#{MOUNT_TYPE}" == "nfs"
+    config.vm.synced_folder HOME, HOME, type: "nfs", mount_options: ["vers=3,tcp"]
+  else
+    config.vm.synced_folder HOME, HOME, type: MOUNT_TYPE
+  end
 
   if NUM_NODES==0
     provision(config.vm, 0)
diff --git a/scripts/provision/vagrant b/scripts/provision/vagrant
index 663d9d6e18..b637d475eb 100755
--- a/scripts/provision/vagrant
+++ b/scripts/provision/vagrant
@@ -68,6 +68,19 @@ cat <<\EOF >/etc/motd
 
 EOF
 
+# --- Enable IPv6 and IP forwarding
+sysctl -w net.ipv4.ip_forward=1
+sysctl -w net.ipv6.conf.all.disable_ipv6=0
+sysctl -w net.ipv6.conf.all.forwarding=1
+sed -i \
+    -e "/^net.ipv6.conf.all.disable_ipv6 = 1/d" \
+    /etc/sysctl.conf
+cat <<EOF >>/etc/sysctl.conf
+net.ipv4.ip_forward = 1
+net.ipv6.conf.all.disable_ipv6 = 0
+net.ipv6.conf.all.forwarding = 1
+EOF
+
 # --- Utility function to download go
 download_go() {
     goversion=$(grep "golang:" Dockerfile.dapper | sed -e 's/.*golang:\(.*\)-.*/\1/')