diff --git a/.gitignore b/.gitignore
index 2557260c2cd37bc253dd9a6de7b5ce93a7af3fab..52e3545a550d50fda624007660777bd904b691d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,6 @@ pkg/openwsn/openwsn
 pkg/relic/relic
 pkg/tlsf/tlsf
 pkg/wakaama/wakaama
+
+# Vagrant
+.vagrant
diff --git a/Vagrantfile b/Vagrantfile
new file mode 100644
index 0000000000000000000000000000000000000000..9684bbf58e21d6b991008d4d5c01a650b90975ee
--- /dev/null
+++ b/Vagrantfile
@@ -0,0 +1,57 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure(2) do |config|
+  # 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 = "boxcutter/ubuntu1510"
+
+  # 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
+
+  config.vm.network "forwarded_port", guest: 4242, host: 4242
+
+  # 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.
+  config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = true
+  #
+  #   # Set name of the VM
+    vb.name = "RIOT-OS VM"
+  #
+  #   # Customize the amount of memory on the VM:
+  #   vb.memory = "1024"
+  #   # enable usb passthrough
+    vb.customize ["modifyvm", :id, "--usb", "on"]
+    vb.customize ["modifyvm", :id, "--usbxhci", "on"]
+    vb.customize ['usbfilter', 'add', '0', '--target', :id, '--name', 'FTDI USB-TTL',
+                  '--vendorid', '0x0403', '--productid',  '0x6001']
+    vb.customize ['usbfilter', 'add', '0', '--target', :id, '--name', 'CP2102 USB to UART',
+                  '--vendorid', '0x10c4', '--productid',  '0xea60']
+    vb.customize ['usbfilter', 'add', '0', '--target', :id, '--name', 'STM32 STLink',
+                  '--vendorid', '0x0483', '--productid',  '0x3748']
+    vb.customize ['usbfilter', 'add', '0', '--target', :id, '--name', 'USBasp',
+                  '--vendorid', '0x16c0', '--productid',  '0x05dc']
+    vb.customize ['usbfilter', 'add', '0', '--target', :id, '--name', 'iotlab-m3',
+                  '--vendorid', '0x0403', '--productid',  '0x6010']
+    vb.customize ['usbfilter', 'add', '0', '--target', :id, '--name', 'samr21-xpro',
+                  '--vendorid', '0x03eb', '--productid',  '0x2111']
+    vb.customize ['usbfilter', 'add', '0', '--target', :id, '--name', 'Arduino Mega 2560',
+                  '--vendorid', '0x2341', '--productid',  '0x0042']
+  end
+
+  config.vm.provision "file", source: "~/.gitconfig", destination: ".gitconfig"
+  config.vm.provision "shell", path: "dist/tools/vagrant/bootstrap.sh"
+end
diff --git a/dist/tools/vagrant/README.md b/dist/tools/vagrant/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..d638c02cb00e51e52134b2f4e313cba54a7f2ab5
--- /dev/null
+++ b/dist/tools/vagrant/README.md
@@ -0,0 +1,56 @@
+# RIOT VM
+
+
+## About
+This repository includes a [Vagrantfile](https://github.com/RIOT-OS/RIOT/blob/master/Vagrantfile)
+to create and control a Linux virtual machine based on an Ubuntu Trusty (64-bit) image that contains
+all necessary toolchains and dependencies to build and flash compatible devices with RIOT-OS.
+The advantage of using this VM is to have a reproducable, portable and even disposable environment
+that can be used to develop for RIOT-OS with decreased setup times and without the requirement of
+making changes to the underlying host system.
+
+## Requirements
+Make sure your system satisfies the latest version of all following dependencies:
+* [VirtualBox](https://www.virtualbox.org/wiki/Downloads)
+* [VirtualBox Exntension Pack](https://www.virtualbox.org/wiki/Downloads)
+* [Vagrant](https://www.vagrantup.com/downloads.html)
+
+## Usage
+The following commands must be run from the RIOT-OS root directory on the host system.
+
+```
+vagrant up
+```
+This will start up the virtual machine and download the Ubuntu image as well as all necessary toolchains.
+```
+vagrant ssh
+```
+This will logs you in to the VM as the vagrant user.
+```
+vagrant halt
+```
+This will shut down the VM gracefully.
+```
+vagrant destroy
+```
+This will reset your VM to the default state. All modifications made to the VM by the
+[provisioning script](https://github.com/RIOT-OS/RIOT/tree/master/dist/tools/vagrant/bootstrap.sh)
+and by you will be removed.
+```
+vagrant provision
+```
+This will re-run the [provisioning script](https://github.com/RIOT-OS/RIOT/tree/master/dist/tools/vagrant/bootstrap.sh).
+
+## Inside the VM
+Once logged in to the VM via `vagrant ssh` you can find the RIOT-OS root directory in your
+working directory. This is a shared directory and stays synchronized with your RIOT-OS directory
+on the host system. All changes made will be mirrored from the host system to the guest system
+and vice versa.
+
+This feature allows you to conveniently develop code for RIOT-OS with your preferred IDE on
+your host system and use the VM for compiling, flashing devices and running the native port of RIOT-OS.
+
+## Additional Information
+For new boards it is necessary to add new udev rules to `dist/tools/vagrant/udev_rules` and
+additional usb filters to the Vagrantfile so that VirtualBox is able to capture the devices.
+The needed `vendor id` and `product id` can be obtained by running `vboxmanage list usbhost`.
diff --git a/dist/tools/vagrant/bootstrap.sh b/dist/tools/vagrant/bootstrap.sh
new file mode 100644
index 0000000000000000000000000000000000000000..b59698f799e6035d8ddee761863b133c3674cfb9
--- /dev/null
+++ b/dist/tools/vagrant/bootstrap.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+apt-get update
+apt-get install -y pcregrep libpcre3 python3 git gcc-arm-none-eabi gcc-msp430 unzip \
+    qemu-system-x86 g++-multilib gcc-multilib build-essential gcc-avr binutils-avr avr-libc \
+    avrdude doxygen cppcheck python-setuptools libusb-1.0-0 libusb-1.0-0-dev libftdi1 libftdi-dev \
+    libftdipp1-dev libftdipp1-2v5 libhidapi-dev libhidapi-hidraw0 libhidapi-libusb0 make cmake \
+    autotools-dev autoconf pkg-config jimsh libtool valgrind openocd python-serial python3-serial
+
+# give permissions for serial ports
+adduser vagrant dialout
+
+if ! hash st-util 2>/dev/null; then
+    git clone --depth 1 https://github.com/texane/stlink stlink.git && cd stlink.git
+    ./autogen.sh && ./configure && make && make install
+    cd .. && rm -rf stlink.git
+fi
+
+# install cli-tools
+if ! hash experiment-cli 2>/dev/null; then
+    wget -qO - https://github.com/iot-lab/cli-tools/archive/1.6.0.tar.gz | tar xz
+    cd cli-tools-1.6.0 && python setup.py install && cd .. && rm -rf cli-tools-1.6.0
+fi
+
+# create a symbolic link to the RIOT-OS directory
+if ! [ -L /home/vagrant/RIOT-OS ]; then
+    ln -fs /vagrant /home/vagrant/RIOT-OS
+    chown -h vagrant:vagrant /home/vagrant/RIOT-OS
+fi
+
+# copy udev rules
+cp -f RIOT-OS/dist/tools/vagrant/udev_rules/*.rules /etc/udev/rules.d/
+udevadm control --reload-rules ; udevadm trigger
+
+# cleanup
+apt-get -y autoremove
diff --git a/dist/tools/vagrant/udev_rules/45-usb-stlink-v2.rules b/dist/tools/vagrant/udev_rules/45-usb-stlink-v2.rules
new file mode 100644
index 0000000000000000000000000000000000000000..8a193e837671027dee9b44be145bc1c82e6ef40c
--- /dev/null
+++ b/dist/tools/vagrant/udev_rules/45-usb-stlink-v2.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="usb", ATTR{idVendor}=="0483", ATTR{idProduct}=="3748", MODE="0666", OWNER="vagrant"
diff --git a/dist/tools/vagrant/udev_rules/52-usbasp.rules b/dist/tools/vagrant/udev_rules/52-usbasp.rules
new file mode 100644
index 0000000000000000000000000000000000000000..f7af9c36f07c251786908b49a538425123b93b57
--- /dev/null
+++ b/dist/tools/vagrant/udev_rules/52-usbasp.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="usb", ATTR{idVendor}=="16c0", ATTR{idProduct}=="05dc", MODE="0666", OWNER="vagrant"
diff --git a/dist/tools/vagrant/udev_rules/53-usbttl.rules b/dist/tools/vagrant/udev_rules/53-usbttl.rules
new file mode 100644
index 0000000000000000000000000000000000000000..f3435b802617b884fdd17e1149cc1b5d43d88446
--- /dev/null
+++ b/dist/tools/vagrant/udev_rules/53-usbttl.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="usb", ATTR{idVendor}=="0403", ATTR{idProduct}=="6001", MODE="0666", OWNER="vagrant"
diff --git a/dist/tools/vagrant/udev_rules/99-atmega2560.rules b/dist/tools/vagrant/udev_rules/99-atmega2560.rules
new file mode 100644
index 0000000000000000000000000000000000000000..d4933b9231d2d250acd93b4dd2ee4e82c03650ce
--- /dev/null
+++ b/dist/tools/vagrant/udev_rules/99-atmega2560.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="usb", ATTR{idVendor}=="2341", ATTR{idProduct}=="0042", MODE="0666", OWNER="vagrant"
diff --git a/dist/tools/vagrant/udev_rules/99-hidraw.rules b/dist/tools/vagrant/udev_rules/99-hidraw.rules
new file mode 100644
index 0000000000000000000000000000000000000000..3a195538b40f3aba7b43abe0d0354331e6757d08
--- /dev/null
+++ b/dist/tools/vagrant/udev_rules/99-hidraw.rules
@@ -0,0 +1 @@
+KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0666", OWNER="vagrant"
diff --git a/dist/tools/vagrant/udev_rules/99-iotlab-m3.rules b/dist/tools/vagrant/udev_rules/99-iotlab-m3.rules
new file mode 100644
index 0000000000000000000000000000000000000000..04851e0d3185cf0be8adffb2f37388e942fc78c7
--- /dev/null
+++ b/dist/tools/vagrant/udev_rules/99-iotlab-m3.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="usb", ATTR{idVendor}=="0403", ATTR{idProduct}=="6010", MODE="0666", OWNER="vagrant"
diff --git a/dist/tools/vagrant/udev_rules/99-samr21-xpro.rules b/dist/tools/vagrant/udev_rules/99-samr21-xpro.rules
new file mode 100644
index 0000000000000000000000000000000000000000..4228b2aaf115cc2fa5c32abf46921461b782860c
--- /dev/null
+++ b/dist/tools/vagrant/udev_rules/99-samr21-xpro.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="usb", ATTR{idVendor}=="03eb", ATTR{idProduct}=="2111", MODE="0666", OWNER="vagrant"