diff --git a/README.md b/README.md
index 57452a91d..f80ce4e9a 100644
--- a/README.md
+++ b/README.md
@@ -31,8 +31,8 @@ These baseboxes were all built using a Mac OS X host running VirtualBox 4.3.16,
 * [opscode-debian-6.0.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-6.0.10_chef-provisionerless.box)
 * [opscode-debian-7.8-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.8-i386_chef-provisionerless.box)
 * [opscode-debian-7.8](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.8_chef-provisionerless.box)
-* [opscode-debian-8.0-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.0-i386_chef-provisionerless.box)
-* [opscode-debian-8.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.0_chef-provisionerless.box)
+* [opscode-debian-8.1-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.1-i386_chef-provisionerless.box)
+* [opscode-debian-8.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-8.1_chef-provisionerless.box)
 * [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20-i386_chef-provisionerless.box)
 * [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20_chef-provisionerless.box)
 * [opscode-fedora-21-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-21-i386_chef-provisionerless.box)
@@ -72,8 +72,8 @@ these boxes. Using `--provider vmware_fusion`, will not.
 * [opscode-debian-6.0.10](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-6.0.10_chef-provisionerless.box)
 * [opscode-debian-7.8-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.8-i386_chef-provisionerless.box)
 * [opscode-debian-7.8](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-7.8_chef-provisionerless.box)
-* [opscode-debian-8.0-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.0-i386_chef-provisionerless.box)
-* [opscode-debian-8.0](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.0_chef-provisionerless.box)
+* [opscode-debian-8.1-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.1-i386_chef-provisionerless.box)
+* [opscode-debian-8.1](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_debian-8.1_chef-provisionerless.box)
 * [opscode-fedora-20-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20-i386_chef-provisionerless.box)
 * [opscode-fedora-20](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-20_chef-provisionerless.box)
 * [opscode-fedora-21-i386](http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-21-i386_chef-provisionerless.box)
diff --git a/debian-8.0-amd64.json b/debian-8.0-amd64.json
deleted file mode 100644
index 2e0d8c2e3..000000000
--- a/debian-8.0-amd64.json
+++ /dev/null
@@ -1,186 +0,0 @@
-{
-  "builders": [
-    {
-      "boot_command": [
-        "<esc><wait>",
-        "install <wait>",
-        "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>",
-        "debian-installer=en_US <wait>",
-        "auto <wait>",
-        "locale=en_US <wait>",
-        "kbd-chooser/method=us <wait>",
-        "keyboard-configuration/xkb-keymap=us <wait>",
-        "netcfg/get_hostname={{ .Name }} <wait>",
-        "netcfg/get_domain=vagrantup.com <wait>",
-        "fb=false <wait>",
-        "debconf/frontend=noninteractive <wait>",
-        "console-setup/ask_detect=false <wait>",
-        "console-keymaps-at/keymap=us <wait>",
-        "<enter><wait>"
-      ],
-      "boot_wait": "10s",
-      "disk_size": 40960,
-      "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
-      "guest_os_type": "Debian_64",
-      "hard_drive_interface": "sata",
-      "http_directory": "http",
-      "iso_checksum": "5a3a023633552b2ceee0d34c541e840c0f7c50ff",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{user `mirror`}}/8.0.0/amd64/iso-cd/debian-8.0.0-amd64-CD-1.iso",
-      "output_directory": "packer-debian-8.0-amd64-virtualbox",
-      "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now",
-      "ssh_password": "vagrant",
-      "ssh_port": 22,
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "384"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "1"
-        ]
-      ],
-      "virtualbox_version_file": ".vbox_version",
-      "vm_name": "packer-debian-8.0-amd64"
-    },
-    {
-      "boot_command": [
-        "<esc><wait>",
-        "install <wait>",
-        "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>",
-        "debian-installer=en_US <wait>",
-        "auto <wait>",
-        "locale=en_US <wait>",
-        "kbd-chooser/method=us <wait>",
-        "keyboard-configuration/xkb-keymap=us <wait>",
-        "netcfg/get_hostname={{ .Name }} <wait>",
-        "netcfg/get_domain=vagrantup.com <wait>",
-        "fb=false <wait>",
-        "debconf/frontend=noninteractive <wait>",
-        "console-setup/ask_detect=false <wait>",
-        "console-keymaps-at/keymap=us <wait>",
-        "<enter><wait>"
-      ],
-      "boot_wait": "10s",
-      "disk_size": 40960,
-      "guest_os_type": "debian8-64",
-      "http_directory": "http",
-      "iso_checksum": "5a3a023633552b2ceee0d34c541e840c0f7c50ff",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{user `mirror`}}/8.0.0/amd64/iso-cd/debian-8.0.0-amd64-CD-1.iso",
-      "output_directory": "packer-debian-8.0-amd64-vmware",
-      "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now",
-      "ssh_password": "vagrant",
-      "ssh_port": 22,
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "tools_upload_flavor": "linux",
-      "type": "vmware-iso",
-      "vm_name": "packer-debian-8.0-amd64",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "384",
-        "numvcpus": "1"
-      }
-    },
-    {
-      "boot_command": [
-        "<esc><wait>",
-        "install <wait>",
-        "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>",
-        "debian-installer=en_US <wait>",
-        "auto <wait>",
-        "locale=en_US <wait>",
-        "kbd-chooser/method=us <wait>",
-        "keyboard-configuration/xkb-keymap=us <wait>",
-        "netcfg/get_hostname={{ .Name }} <wait>",
-        "netcfg/get_domain=vagrantup.com <wait>",
-        "fb=false <wait>",
-        "debconf/frontend=noninteractive <wait>",
-        "console-setup/ask_detect=false <wait>",
-        "console-keymaps-at/keymap=us <wait>",
-        "<enter><wait>"
-      ],
-      "boot_wait": "10s",
-      "disk_size": 40960,
-      "guest_os_type": "debian",
-      "http_directory": "http",
-      "iso_checksum": "5a3a023633552b2ceee0d34c541e840c0f7c50ff",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{user `mirror`}}/8.0.0/amd64/iso-cd/debian-8.0.0-amd64-CD-1.iso",
-      "output_directory": "packer-debian-8.0-amd64-parallels",
-      "parallels_tools_flavor": "lin",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "384"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "1"
-        ]
-      ],
-      "prlctl_version_file": ".prlctl_version",
-      "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now",
-      "ssh_password": "vagrant",
-      "ssh_port": 22,
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "packer-debian-8.0-amd64"
-    }
-  ],
-  "post-processors": [
-    {
-      "output": "builds/{{user `box_basename`}}.{{.Provider}}.box",
-      "type": "vagrant"
-    }
-  ],
-  "provisioners": [
-    {
-      "destination": "/tmp/bento-metadata.json",
-      "source": "{{user `metadata`}}",
-      "type": "file"
-    },
-    {
-      "environment_vars": [],
-      "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
-      "scripts": [
-        "scripts/common/metadata.sh",
-        "scripts/debian/update.sh",
-        "scripts/common/sshd.sh",
-        "scripts/debian/networking.sh",
-        "scripts/debian/sudoers.sh",
-        "scripts/common/vagrant.sh",
-        "scripts/common/vmtools.sh",
-        "scripts/debian/cleanup.sh",
-        "scripts/common/minimize.sh"
-      ],
-      "type": "shell"
-    }
-  ],
-  "variables": {
-    "arch": "64",
-    "box_basename": "debian-8.0",
-    "build_timestamp": "{{isotime \"20060102150405\"}}",
-    "git_revision": "__unknown_git_revision__",
-    "metadata": "floppy/dummy_metadata.json",
-    "mirror": "http://cdimage.debian.org/cdimage/archive",
-    "name": "debian-8.0",
-    "template": "debian-8.0-amd64",
-    "version": "2.0.TIMESTAMP"
-  }
-}
-
diff --git a/debian-8.0-i386.json b/debian-8.0-i386.json
deleted file mode 100644
index 2edb65735..000000000
--- a/debian-8.0-i386.json
+++ /dev/null
@@ -1,186 +0,0 @@
-{
-  "builders": [
-    {
-      "boot_command": [
-        "<esc><wait>",
-        "install <wait>",
-        "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>",
-        "debian-installer=en_US <wait>",
-        "auto <wait>",
-        "locale=en_US <wait>",
-        "kbd-chooser/method=us <wait>",
-        "keyboard-configuration/xkb-keymap=us <wait>",
-        "netcfg/get_hostname={{ .Name }} <wait>",
-        "netcfg/get_domain=vagrantup.com <wait>",
-        "fb=false <wait>",
-        "debconf/frontend=noninteractive <wait>",
-        "console-setup/ask_detect=false <wait>",
-        "console-keymaps-at/keymap=us <wait>",
-        "<enter><wait>"
-      ],
-      "boot_wait": "10s",
-      "disk_size": 40960,
-      "guest_additions_path": "VBoxGuestAdditions_{{.Version}}.iso",
-      "guest_os_type": "Debian",
-      "hard_drive_interface": "sata",
-      "http_directory": "http",
-      "iso_checksum": "a8101b2e4ef3bdc5051796eda91263c71c90eb90",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{user `mirror`}}/8.0.0/i386/iso-cd/debian-8.0.0-i386-CD-1.iso",
-      "output_directory": "packer-debian-8.0-i386-virtualbox",
-      "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now",
-      "ssh_password": "vagrant",
-      "ssh_port": 22,
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "virtualbox-iso",
-      "vboxmanage": [
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--memory",
-          "384"
-        ],
-        [
-          "modifyvm",
-          "{{.Name}}",
-          "--cpus",
-          "1"
-        ]
-      ],
-      "virtualbox_version_file": ".vbox_version",
-      "vm_name": "packer-debian-8.0-i386"
-    },
-    {
-      "boot_command": [
-        "<esc><wait>",
-        "install <wait>",
-        "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>",
-        "debian-installer=en_US <wait>",
-        "auto <wait>",
-        "locale=en_US <wait>",
-        "kbd-chooser/method=us <wait>",
-        "keyboard-configuration/xkb-keymap=us <wait>",
-        "netcfg/get_hostname={{ .Name }} <wait>",
-        "netcfg/get_domain=vagrantup.com <wait>",
-        "fb=false <wait>",
-        "debconf/frontend=noninteractive <wait>",
-        "console-setup/ask_detect=false <wait>",
-        "console-keymaps-at/keymap=us <wait>",
-        "<enter><wait>"
-      ],
-      "boot_wait": "10s",
-      "disk_size": 40960,
-      "guest_os_type": "debian8",
-      "http_directory": "http",
-      "iso_checksum": "a8101b2e4ef3bdc5051796eda91263c71c90eb90",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{user `mirror`}}/8.0.0/i386/iso-cd/debian-8.0.0-i386-CD-1.iso",
-      "output_directory": "packer-debian-8.0-i386-vmware",
-      "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now",
-      "ssh_password": "vagrant",
-      "ssh_port": 22,
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "tools_upload_flavor": "linux",
-      "type": "vmware-iso",
-      "vm_name": "packer-debian-8.0-i386",
-      "vmx_data": {
-        "cpuid.coresPerSocket": "1",
-        "memsize": "384",
-        "numvcpus": "1"
-      }
-    },
-    {
-      "boot_command": [
-        "<esc><wait>",
-        "install <wait>",
-        "preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/debian-8/preseed.cfg <wait>",
-        "debian-installer=en_US <wait>",
-        "auto <wait>",
-        "locale=en_US <wait>",
-        "kbd-chooser/method=us <wait>",
-        "keyboard-configuration/xkb-keymap=us <wait>",
-        "netcfg/get_hostname={{ .Name }} <wait>",
-        "netcfg/get_domain=vagrantup.com <wait>",
-        "fb=false <wait>",
-        "debconf/frontend=noninteractive <wait>",
-        "console-setup/ask_detect=false <wait>",
-        "console-keymaps-at/keymap=us <wait>",
-        "<enter><wait>"
-      ],
-      "boot_wait": "10s",
-      "disk_size": 40960,
-      "guest_os_type": "debian",
-      "http_directory": "http",
-      "iso_checksum": "a8101b2e4ef3bdc5051796eda91263c71c90eb90",
-      "iso_checksum_type": "sha1",
-      "iso_url": "{{user `mirror`}}/8.0.0/i386/iso-cd/debian-8.0.0-i386-CD-1.iso",
-      "output_directory": "packer-debian-8.0-i386-parallels",
-      "parallels_tools_flavor": "lin",
-      "prlctl": [
-        [
-          "set",
-          "{{.Name}}",
-          "--memsize",
-          "384"
-        ],
-        [
-          "set",
-          "{{.Name}}",
-          "--cpus",
-          "1"
-        ]
-      ],
-      "prlctl_version_file": ".prlctl_version",
-      "shutdown_command": "echo 'vagrant'|sudo -S /sbin/shutdown -hP now",
-      "ssh_password": "vagrant",
-      "ssh_port": 22,
-      "ssh_username": "vagrant",
-      "ssh_wait_timeout": "10000s",
-      "type": "parallels-iso",
-      "vm_name": "packer-debian-8.0-i386"
-    }
-  ],
-  "post-processors": [
-    {
-      "output": "builds/{{user `box_basename`}}.{{.Provider}}.box",
-      "type": "vagrant"
-    }
-  ],
-  "provisioners": [
-    {
-      "destination": "/tmp/bento-metadata.json",
-      "source": "{{user `metadata`}}",
-      "type": "file"
-    },
-    {
-      "environment_vars": [],
-      "execute_command": "echo 'vagrant' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
-      "scripts": [
-        "scripts/common/metadata.sh",
-        "scripts/debian/update.sh",
-        "scripts/common/sshd.sh",
-        "scripts/debian/networking.sh",
-        "scripts/debian/sudoers.sh",
-        "scripts/common/vagrant.sh",
-        "scripts/common/vmtools.sh",
-        "scripts/debian/cleanup.sh",
-        "scripts/common/minimize.sh"
-      ],
-      "type": "shell"
-    }
-  ],
-  "variables": {
-    "arch": "32",
-    "box_basename": "debian-8.0-i386",
-    "build_timestamp": "{{isotime \"20060102150405\"}}",
-    "git_revision": "__unknown_git_revision__",
-    "metadata": "floppy/dummy_metadata.json",
-    "mirror": "http://cdimage.debian.org/cdimage/archive",
-    "name": "debian-8.0-i386",
-    "template": "debian-8.0-i386",
-    "version": "2.0.TIMESTAMP"
-  }
-}
-