diff --git a/packer/freebsd-10.0-amd64.json b/packer/freebsd-10.1-amd64.json
similarity index 76%
rename from packer/freebsd-10.0-amd64.json
rename to packer/freebsd-10.1-amd64.json
index 371712997..7fe1ff679 100644
--- a/packer/freebsd-10.0-amd64.json
+++ b/packer/freebsd-10.1-amd64.json
@@ -22,10 +22,6 @@
       "type": "virtualbox-iso",
       "boot_command": [
         "<esc><wait>",
-        "load geom_mbr<wait>",
-        "<enter><wait>",
-        "load zfs<wait>",
-        "<enter><wait>",
         "boot -s<wait>",
         "<enter><wait>",
         "<wait10><wait10>",
@@ -33,15 +29,15 @@
         "mdmfs -s 100m md1 /tmp<enter><wait>",
         "mdmfs -s 100m md2 /mnt<enter><wait>",
         "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>",
-        "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.0/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>"
+        "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>"
       ],
       "boot_wait": "10s",
       "disk_size": 10140,
       "guest_os_type": "FreeBSD_64",
       "http_directory": "http",
-      "iso_checksum": "9c377b4a4e63443c0b210080694de26133e6a276eddb07c7e00e1c9aebd84109",
+      "iso_checksum": "0c3d64ce48c3ef761761d0fea07e1935e296f8c045c249118bc91a7faf053a6b",
       "iso_checksum_type": "sha256",
-      "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.0/FreeBSD-10.0-RELEASE-amd64-disc1.iso",
+      "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-amd64-disc1.iso",
       "ssh_username": "vagrant",
       "ssh_password": "vagrant",
       "ssh_port": 22,
@@ -49,8 +45,8 @@
       "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
       "virtualbox_version_file": ".vbox_version",
-      "vm_name": "packer-freebsd-10.0-amd64",
-      "output_directory": "packer-freebsd-10.0-amd64-virtualbox",
+      "vm_name": "packer-freebsd-10.1-amd64",
+      "output_directory": "packer-freebsd-10.1-amd64-virtualbox",
       "vboxmanage": [
         [ "modifyvm", "{{.Name}}", "--memory", "512" ],
         [ "modifyvm", "{{.Name}}", "--cpus", "1" ]
@@ -60,10 +56,6 @@
       "type": "vmware-iso",
       "boot_command": [
         "<esc><wait>",
-        "load geom_mbr<wait>",
-        "<enter><wait>",
-        "load zfs<wait>",
-        "<enter><wait>",
         "boot -s<wait>",
         "<enter><wait>",
         "<wait10><wait10>",
@@ -72,22 +64,22 @@
         "mdmfs -s 100m md2 /mnt<enter><wait>",
         "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>",
         "<wait5>",
-        "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.0/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>"
+        "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>"
       ],
       "boot_wait": "10s",
       "disk_size": 10140,
       "guest_os_type": "freebsd-64",
       "http_directory": "http",
-      "iso_checksum": "9c377b4a4e63443c0b210080694de26133e6a276eddb07c7e00e1c9aebd84109",
+      "iso_checksum": "0c3d64ce48c3ef761761d0fea07e1935e296f8c045c249118bc91a7faf053a6b",
       "iso_checksum_type": "sha256",
-      "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.0/FreeBSD-10.0-RELEASE-amd64-disc1.iso",
+      "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-amd64-disc1.iso",
       "ssh_username": "vagrant",
       "ssh_password": "vagrant",
       "ssh_port": 22,
       "ssh_wait_timeout": "10000s",
       "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -",
-      "vm_name": "packer-freebsd-10.0-amd64",
-      "output_directory": "packer-freebsd-10.0-amd64-vmware",
+      "vm_name": "packer-freebsd-10.1-amd64",
+      "output_directory": "packer-freebsd-10.1-amd64-vmware",
       "tools_upload_flavor": "freebsd",
       "vmx_data": {
         "memsize": "512",
@@ -99,10 +91,6 @@
       "type": "parallels-iso",
       "boot_command": [
         "<esc><wait>",
-        "load geom_mbr<wait>",
-        "<enter><wait>",
-        "load zfs<wait>",
-        "<enter><wait>",
         "boot -s<wait>",
         "<enter><wait>",
         "<wait10><wait10>",
@@ -110,15 +98,15 @@
         "mdmfs -s 100m md1 /tmp<enter><wait>",
         "mdmfs -s 100m md2 /mnt<enter><wait>",
         "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>",
-        "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.0/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>"
+        "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>"
       ],
       "boot_wait": "10s",
       "disk_size": 10140,
       "guest_os_type": "freebsd",
       "http_directory": "http",
-      "iso_checksum": "9c377b4a4e63443c0b210080694de26133e6a276eddb07c7e00e1c9aebd84109",
+      "iso_checksum": "0c3d64ce48c3ef761761d0fea07e1935e296f8c045c249118bc91a7faf053a6b",
       "iso_checksum_type": "sha256",
-      "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.0/FreeBSD-10.0-RELEASE-amd64-disc1.iso",
+      "iso_url": "{{user `mirror`}}/releases/amd64/amd64/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-amd64-disc1.iso",
       "ssh_username": "vagrant",
       "ssh_password": "vagrant",
       "ssh_port": 22,
@@ -126,8 +114,8 @@
       "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -",
       "parallels_tools_mode": "disable",
       "prlctl_version_file": ".prlctl_version",
-      "vm_name": "packer-freebsd-10.0-amd64",
-      "output_directory": "packer-freebsd-10.0-amd64-parallels",
+      "vm_name": "packer-freebsd-10.1-amd64",
+      "output_directory": "packer-freebsd-10.1-amd64-parallels",
       "prlctl": [
         [ "set", "{{.Name}}", "--memsize", "512" ],
         [ "set", "{{.Name}}", "--cpus", "1" ],
@@ -139,7 +127,7 @@
   ],
   "post-processors": [
     {
-      "output": "../builds/{{.Provider}}/opscode_freebsd-10.0_chef-{{user `chef_version`}}.box",
+      "output": "../builds/{{.Provider}}/opscode_freebsd-10.1_chef-{{user `chef_version`}}.box",
       "override": {
         "parallels": {
           "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb"
diff --git a/packer/freebsd-10.0-i386.json b/packer/freebsd-10.1-i386.json
similarity index 76%
rename from packer/freebsd-10.0-i386.json
rename to packer/freebsd-10.1-i386.json
index 9f9c14b51..e02514985 100644
--- a/packer/freebsd-10.0-i386.json
+++ b/packer/freebsd-10.1-i386.json
@@ -22,10 +22,6 @@
       "type": "virtualbox-iso",
       "boot_command": [
         "<esc><wait>",
-        "load geom_mbr<wait>",
-        "<enter><wait>",
-        "load zfs<wait>",
-        "<enter><wait>",
         "boot -s<wait>",
         "<enter><wait>",
         "<wait10><wait10>",
@@ -33,15 +29,15 @@
         "mdmfs -s 100m md1 /tmp<enter><wait>",
         "mdmfs -s 100m md2 /mnt<enter><wait>",
         "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>",
-        "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.0/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>"
+        "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>"
       ],
       "boot_wait": "10s",
       "disk_size": 10140,
       "guest_os_type": "FreeBSD",
       "http_directory": "http",
-      "iso_checksum": "2c09643b3f79c703e424c03408882369025cec655c24a6d81ee073081ee75ebc",
+      "iso_checksum": "fe31790b762b01c99791d33e7fd9ab97323654785ce21f588116c8b4eb381cd0",
       "iso_checksum_type": "sha256",
-      "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.0/FreeBSD-10.0-RELEASE-i386-disc1.iso",
+      "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-i386-disc1.iso",
       "ssh_username": "vagrant",
       "ssh_password": "vagrant",
       "ssh_port": 22,
@@ -49,8 +45,8 @@
       "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -",
       "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
       "virtualbox_version_file": ".vbox_version",
-      "vm_name": "packer-freebsd-10.0-i386",
-      "output_directory": "packer-freebsd-10.0-i386-virtualbox",
+      "vm_name": "packer-freebsd-10.1-i386",
+      "output_directory": "packer-freebsd-10.1-i386-virtualbox",
       "vboxmanage": [
         [ "modifyvm", "{{.Name}}", "--memory", "512" ],
         [ "modifyvm", "{{.Name}}", "--cpus", "1" ]
@@ -60,10 +56,6 @@
       "type": "vmware-iso",
       "boot_command": [
         "<esc><wait>",
-        "load geom_mbr<wait>",
-        "<enter><wait>",
-        "load zfs<wait>",
-        "<enter><wait>",
         "boot -s<wait>",
         "<enter><wait>",
         "<wait10><wait10>",
@@ -72,22 +64,22 @@
         "mdmfs -s 100m md2 /mnt<enter><wait>",
         "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>",
         "<wait5>",
-        "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.0/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>"
+        "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>"
       ],
       "boot_wait": "10s",
       "disk_size": 10140,
       "guest_os_type": "freebsd",
       "http_directory": "http",
-      "iso_checksum": "2c09643b3f79c703e424c03408882369025cec655c24a6d81ee073081ee75ebc",
+      "iso_checksum": "fe31790b762b01c99791d33e7fd9ab97323654785ce21f588116c8b4eb381cd0",
       "iso_checksum_type": "sha256",
-      "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.0/FreeBSD-10.0-RELEASE-i386-disc1.iso",
+      "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-i386-disc1.iso",
       "ssh_username": "vagrant",
       "ssh_password": "vagrant",
       "ssh_port": 22,
       "ssh_wait_timeout": "10000s",
       "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -",
-      "vm_name": "packer-freebsd-10.0-i386",
-      "output_directory": "packer-freebsd-10.0-i386-vmware",
+      "vm_name": "packer-freebsd-10.1-i386",
+      "output_directory": "packer-freebsd-10.1-i386-vmware",
       "tools_upload_flavor": "freebsd",
       "vmx_data": {
         "memsize": "512",
@@ -99,10 +91,6 @@
       "type": "parallels-iso",
       "boot_command": [
         "<esc><wait>",
-        "load geom_mbr<wait>",
-        "<enter><wait>",
-        "load zfs<wait>",
-        "<enter><wait>",
         "boot -s<wait>",
         "<enter><wait>",
         "<wait10><wait10>",
@@ -110,15 +98,15 @@
         "mdmfs -s 100m md1 /tmp<enter><wait>",
         "mdmfs -s 100m md2 /mnt<enter><wait>",
         "dhclient -l /tmp/dhclient.lease.em0 em0<enter><wait>",
-        "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.0/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>"
+        "fetch -o /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/freebsd-10.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}<enter><wait>"
       ],
       "boot_wait": "10s",
       "disk_size": 10140,
       "guest_os_type": "freebsd",
       "http_directory": "http",
-      "iso_checksum": "2c09643b3f79c703e424c03408882369025cec655c24a6d81ee073081ee75ebc",
+      "iso_checksum": "fe31790b762b01c99791d33e7fd9ab97323654785ce21f588116c8b4eb381cd0",
       "iso_checksum_type": "sha256",
-      "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.0/FreeBSD-10.0-RELEASE-i386-disc1.iso",
+      "iso_url": "{{user `mirror`}}/releases/i386/i386/ISO-IMAGES/10.1/FreeBSD-10.1-RELEASE-i386-disc1.iso",
       "ssh_username": "vagrant",
       "ssh_password": "vagrant",
       "ssh_port": 22,
@@ -126,8 +114,8 @@
       "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -",
       "parallels_tools_mode": "disable",
       "prlctl_version_file": ".prlctl_version",
-      "vm_name": "packer-freebsd-10.0-amd64",
-      "output_directory": "packer-freebsd-10.0-i386-parallels",
+      "vm_name": "packer-freebsd-10.1-amd64",
+      "output_directory": "packer-freebsd-10.1-i386-parallels",
       "prlctl": [
         [ "set", "{{.Name}}", "--memsize", "512" ],
         [ "set", "{{.Name}}", "--cpus", "1" ],
@@ -139,7 +127,7 @@
   ],
   "post-processors": [
     {
-      "output": "../builds/{{.Provider}}/opscode_freebsd-10.0_chef-{{user `chef_version`}}.box",
+      "output": "../builds/{{.Provider}}/opscode_freebsd-10.1_chef-{{user `chef_version`}}.box",
       "override": {
         "parallels": {
           "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb"
diff --git a/packer/http/freebsd-10.0/install.sh b/packer/http/freebsd-10.1/install.sh
similarity index 100%
rename from packer/http/freebsd-10.0/install.sh
rename to packer/http/freebsd-10.1/install.sh
diff --git a/packer/scripts/freebsd/postinstall.sh b/packer/scripts/freebsd/postinstall.sh
index b18744af3..195bcedff 100644
--- a/packer/scripts/freebsd/postinstall.sh
+++ b/packer/scripts/freebsd/postinstall.sh
@@ -18,7 +18,7 @@ env PAGER=/bin/cat /tmp/freebsd-update install
 #Install sudo, curl and ca_root_nss
 if [ $freebsd_major -gt 9 ]; then
   # Use pkgng
-  env ASSUME_ALWAYS_YES=1 pkg bootstrap
+  env ASSUME_ALWAYS_YES=true pkg bootstrap
   pkg update
   pkg install -y sudo
   pkg install -y curl
@@ -58,12 +58,3 @@ EOT
 pw groupadd vboxusers
 pw groupmod vboxusers -m vagrant
 
-echo "=============================================================================="
-echo "NOTE: FreeBSD - Vagrant"
-echo "When using this basebox you need to do some special stuff in your Vagrantfile"
-echo "1) Enable HostOnly network"
-echo '	 config.vm.network "private_network", ip: "192.168.33.10"'
-echo "2) Use nfs instead of shared folders"
-echo '		config.vm.synced_folder "v-root", "/vagrant", :nfs => true'
-echo "============================================================================="
-exit