diff --git a/release/Makefile b/release/Makefile
index ae1163e3..a16c7cd7 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -10,16 +10,16 @@ clean-outbox: outbox
 .PHONY: linux freebsd
 
 %-vm: %
-	cd vagrant-static-$< && vagrant up
+	cd vagrant-static && vagrant up $<
 
 
 %-build: % %-vm
-	cd vagrant-static-$< && vagrant ssh -c /home/vagrant/build.sh && vagrant destroy -f
+	cd vagrant-static && vagrant ssh $< -c /vagrant/build.sh && vagrant destroy -f $<
 
 %-package: % clean-outbox %-build
 	mkdir -p $<-pkg/lnav-${VERSION}
 	cp ../README ../NEWS $<-pkg/lnav-${VERSION}
-	mv vagrant-static-$</lnav $<-pkg/lnav-${VERSION}
+	mv vagrant-static/lnav $<-pkg/lnav-${VERSION}
 	cd $<-pkg && zip -r ../outbox/lnav-${VERSION}-$<-64bit.zip lnav-${VERSION}
 	rm -rf $<-pkg
 
diff --git a/release/vagrant-static-freebsd/pkg.sh b/release/vagrant-static-freebsd/pkg.sh
deleted file mode 100644
index fab73b21..00000000
--- a/release/vagrant-static-freebsd/pkg.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /usr/bin/env bash
-
-pkg install -y wget git gcc m4
diff --git a/release/vagrant-static-linux/Vagrantfile b/release/vagrant-static-linux/Vagrantfile
deleted file mode 100644
index 936627f4..00000000
--- a/release/vagrant-static-linux/Vagrantfile
+++ /dev/null
@@ -1,131 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  # All Vagrant configuration is done here. The most common configuration
-  # options are documented and commented below. For a complete reference,
-  # please see the online documentation at vagrantup.com.
-
-  # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "hansode/centos-5.6-x86_64"
-
-  config.vm.provision "shell", path: "pkg.sh"
-  config.vm.provision "shell", path: "../provision.sh"
-  config.vm.provision "file", source: "../build.sh", destination: "/home/vagrant/build.sh"
-
-  config.vm.provider "virtualbox" do |v|
-    v.memory = 2048
-    v.cpus = 4
-  end
-
-  # Disable automatic box update checking. If you disable this, then
-  # boxes will only be checked for updates when the user runs
-  # `vagrant box outdated`. This is not recommended.
-  # config.vm.box_check_update = false
-
-  # Create a forwarded port mapping which allows access to a specific port
-  # within the machine from a port on the host machine. In the example below,
-  # accessing "localhost:8080" will access port 80 on the guest machine.
-  # config.vm.network "forwarded_port", guest: 80, host: 8080
-
-  # Create a private network, which allows host-only access to the machine
-  # using a specific IP.
-  # config.vm.network "private_network", ip: "192.168.33.10"
-
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network.
-  # config.vm.network "public_network"
-
-  # If true, then any SSH connections made will enable agent forwarding.
-  # Default value: false
-  # config.ssh.forward_agent = true
-
-  # Share an additional folder to the guest VM. The first argument is
-  # the path on the host to the actual folder. The second argument is
-  # the path on the guest to mount the folder. And the optional third
-  # argument is a set of non-required options.
-  # config.vm.synced_folder "../data", "/vagrant_data"
-
-  # Provider-specific configuration so you can fine-tune various
-  # backing providers for Vagrant. These expose provider-specific options.
-  # Example for VirtualBox:
-  #
-  # config.vm.provider "virtualbox" do |vb|
-  #   # Don't boot with headless mode
-  #   vb.gui = true
-  #
-  #   # Use VBoxManage to customize the VM. For example to change memory:
-  #   vb.customize ["modifyvm", :id, "--memory", "1024"]
-  # end
-  #
-  # View the documentation for the provider you're using for more
-  # information on available options.
-
-  # Enable provisioning with CFEngine. CFEngine Community packages are
-  # automatically installed. For example, configure the host as a
-  # policy server and optionally a policy file to run:
-  #
-  # config.vm.provision "cfengine" do |cf|
-  #   cf.am_policy_hub = true
-  #   # cf.run_file = "motd.cf"
-  # end
-  #
-  # You can also configure and bootstrap a client to an existing
-  # policy server:
-  #
-  # config.vm.provision "cfengine" do |cf|
-  #   cf.policy_server_address = "10.0.2.15"
-  # end
-
-  # Enable provisioning with Puppet stand alone.  Puppet manifests
-  # are contained in a directory path relative to this Vagrantfile.
-  # You will need to create the manifests directory and a manifest in
-  # the file default.pp in the manifests_path directory.
-  #
-  # config.vm.provision "puppet" do |puppet|
-  #   puppet.manifests_path = "manifests"
-  #   puppet.manifest_file  = "site.pp"
-  # end
-
-  # Enable provisioning with chef solo, specifying a cookbooks path, roles
-  # path, and data_bags path (all relative to this Vagrantfile), and adding
-  # some recipes and/or roles.
-  #
-  # config.vm.provision "chef_solo" do |chef|
-  #   chef.cookbooks_path = "../my-recipes/cookbooks"
-  #   chef.roles_path = "../my-recipes/roles"
-  #   chef.data_bags_path = "../my-recipes/data_bags"
-  #   chef.add_recipe "mysql"
-  #   chef.add_role "web"
-  #
-  #   # You may also specify custom JSON attributes:
-  #   chef.json = { mysql_password: "foo" }
-  # end
-
-  # Enable provisioning with chef server, specifying the chef server URL,
-  # and the path to the validation key (relative to this Vagrantfile).
-  #
-  # The Opscode Platform uses HTTPS. Substitute your organization for
-  # ORGNAME in the URL and validation key.
-  #
-  # If you have your own Chef Server, use the appropriate URL, which may be
-  # HTTP instead of HTTPS depending on your configuration. Also change the
-  # validation key to validation.pem.
-  #
-  # config.vm.provision "chef_client" do |chef|
-  #   chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
-  #   chef.validation_key_path = "ORGNAME-validator.pem"
-  # end
-  #
-  # If you're using the Opscode platform, your validator client is
-  # ORGNAME-validator, replacing ORGNAME with your organization name.
-  #
-  # If you have your own Chef Server, the default validation client name is
-  # chef-validator, unless you changed the configuration.
-  #
-  #   chef.validation_client_name = "ORGNAME-validator"
-end
diff --git a/release/vagrant-static-linux/pkg.sh b/release/vagrant-static-linux/pkg.sh
deleted file mode 100644
index fbacc6ae..00000000
--- a/release/vagrant-static-linux/pkg.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /usr/bin/env bash
-
-wget -N http://apt.sw.be/redhat/el5/en/x86_64/rpmforge/RPMS/rpmforge-release-0.5.2-2.el5.rf.x86_64.rpm
-sudo rpm --import http://apt.sw.be/RPM-GPG-KEY.dag.txt
-sudo rpm -K rpmforge-release-0.5.2-2.el5.rf.x86_64.rpm
-sudo rpm -U rpmforge-release-0.5.2-2.el5.rf.x86_64.rpm
-
-sudo yum install -y m4 git gcc44-c++
-
diff --git a/release/vagrant-static-freebsd/Vagrantfile b/release/vagrant-static/Vagrantfile
similarity index 91%
rename from release/vagrant-static-freebsd/Vagrantfile
rename to release/vagrant-static/Vagrantfile
index 1480b3bd..0159ccd4 100644
--- a/release/vagrant-static-freebsd/Vagrantfile
+++ b/release/vagrant-static/Vagrantfile
@@ -12,17 +12,22 @@ Vagrant.configure(2) do |config|
 
   # Every Vagrant development environment requires a box. You can search for
   # boxes at https://atlas.hashicorp.com/search.
-  config.vm.box = "arkadi/freebsd-10.1-amd64"
-
-  config.vm.provision "shell", path: "pkg.sh"
-  config.vm.provision "shell", path: "../provision.sh"
-  config.vm.provision "file", source: "../build.sh", destination: "/home/vagrant/build.sh"
-
   config.vm.provider "virtualbox" do |v|
       v.memory = 2048
       v.cpus = 4
   end
 
+  config.vm.provision "shell", path:"pkg.sh"
+  config.vm.provision "shell", path:"provision.sh"
+
+  config.vm.define :freebsd do |freebsd|
+    freebsd.vm.box = "arkadi/freebsd-10.1-amd64"
+  end
+
+  config.vm.define :linux do |linux|
+      linux.vm.box = "hansode/centos-5.6-x86_64"
+  end
+
   # Disable automatic box update checking. If you disable this, then
   # boxes will only be checked for updates when the user runs
   # `vagrant box outdated`. This is not recommended.
diff --git a/release/build.sh b/release/vagrant-static/build.sh
similarity index 100%
rename from release/build.sh
rename to release/vagrant-static/build.sh
diff --git a/release/vagrant-static/pkg.sh b/release/vagrant-static/pkg.sh
new file mode 100644
index 00000000..568c367c
--- /dev/null
+++ b/release/vagrant-static/pkg.sh
@@ -0,0 +1,13 @@
+#! /usr/bin/env bash
+
+OS=$(uname -s)
+if test x"${OS}" != x"FreeBSD"; then
+    wget -N http://apt.sw.be/redhat/el5/en/x86_64/rpmforge/RPMS/rpmforge-release-0.5.2-2.el5.rf.x86_64.rpm
+    sudo rpm --import http://apt.sw.be/RPM-GPG-KEY.dag.txt
+    sudo rpm -K rpmforge-release-0.5.2-2.el5.rf.x86_64.rpm
+    sudo rpm -U rpmforge-release-0.5.2-2.el5.rf.x86_64.rpm
+
+    sudo yum install -y m4 git gcc44-c++
+else
+    pkg install -y wget git gcc m4
+fi
diff --git a/release/provision.sh b/release/vagrant-static/provision.sh
similarity index 100%
rename from release/provision.sh
rename to release/vagrant-static/provision.sh