diff --git a/.gitignore b/.gitignore
index 4689f3dc30..634e00c9bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -94,6 +94,8 @@
 /tools/mkzenboot
 /tools/iaudio_bl_flash.c
 /tools/iaudio_bl_flash.h
+/tools/.vagrant
+/tools/*-console.log
 
 # /tools/database/
 /tools/database/database
diff --git a/tools/Vagrantfile b/tools/Vagrantfile
new file mode 100644
index 0000000000..18f4e22cc9
--- /dev/null
+++ b/tools/Vagrantfile
@@ -0,0 +1,90 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure("2") do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://atlas.hashicorp.com/search.
+  config.vm.box = "ubuntu/xenial64"
+
+  # 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"
+
+  # 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"
+  config.vm.synced_folder "..", "/rockbox"
+
+  # 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|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = true
+  #
+  #   # Customize the amount of memory on the VM:
+  #   vb.memory = "1024"
+      vb.name = "rockbox-dev"
+  end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
+  # such as FTP and Heroku are also available. See the documentation at
+  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
+  # config.push.define "atlas" do |push|
+  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
+  # end
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+  # config.vm.provision "shell", inline: <<-SHELL
+  #   apt-get update
+  #   apt-get install -y apache2
+  # SHELL
+  config.vm.provision "shell" do |s|
+    s.name = "provision"
+    s.inline = "/rockbox/tools/vagrant/provision.sh"
+  end
+
+  config.vm.provision "shell", privileged: false do |s|
+    s.name = "provision-nonprivileged"
+    s.inline = "/rockbox/tools/vagrant/provision-nonprivileged.sh"
+  end
+
+  config.vm.provision "shell", run: "always" do |s|
+    s.name = "startup"
+    s.inline = "/rockbox/tools/vagrant/startup.sh"
+  end
+
+  # Other options
+  config.vm.hostname = "rockbox-dev"  
+end
diff --git a/tools/vagrant/provision-nonprivileged.sh b/tools/vagrant/provision-nonprivileged.sh
new file mode 100755
index 0000000000..715ac7b16f
--- /dev/null
+++ b/tools/vagrant/provision-nonprivileged.sh
@@ -0,0 +1,21 @@
+#!/bin/bash -e
+
+# Compile and install the Rockbox toolchain
+# s   - sh       (Archos models)
+# m   - m68k     (iriver h1x0/h3x0, iaudio m3/m5/x5 and mpio hd200)
+# a   - arm      (ipods, iriver H10, Sansa, D2, Gigabeat, etc)
+# i   - mips     (Jz4740 and ATJ-based players)
+# r   - arm-app  (Samsung ypr0)
+
+# MIPS toolchain fails at installation: https://pastebin.com/raw/8SBhN58q
+# ARM-APP toolchain is not tested
+echo s m a | RBDEV_PREFIX="${HOME}/rbdev-toolchain" /rockbox/tools/rockboxdev.sh
+echo 'PATH="$HOME/rbdev-toolchain/bin:$PATH"' >> "${HOME}/.profile"
+
+# Download SDL-1.2.5 and compile it using MinGW32
+cd "${HOME}"
+wget --progress=bar:force http://www.libsdl.org/release/SDL-1.2.15.tar.gz
+tar -zxvf SDL-1.2.15.tar.gz
+cd SDL-1.2.15
+./configure --host=x86_64-w64-mingw32 --prefix="${HOME}/mingw32-sdl"
+make install
diff --git a/tools/vagrant/provision.sh b/tools/vagrant/provision.sh
new file mode 100755
index 0000000000..cba1bfefaa
--- /dev/null
+++ b/tools/vagrant/provision.sh
@@ -0,0 +1,6 @@
+#!/bin/bash -e
+
+# Update the OS and install all required packages
+apt-get update
+apt-get dist-upgrade -y
+apt-get install -y zip build-essential gcc-mingw-w64-i686 gcc-mingw-w64-x86-64 texinfo automake libtool-bin flex bison libncurses-dev
diff --git a/tools/vagrant/startup.sh b/tools/vagrant/startup.sh
new file mode 100755
index 0000000000..927cad725d
--- /dev/null
+++ b/tools/vagrant/startup.sh
@@ -0,0 +1,3 @@
+#!/bin/bash -e
+
+# This script runs on every boot