diff --git a/Vagrantfile b/Vagrantfile
new file mode 100644
index 000000000000..76541e436db4
--- /dev/null
+++ b/Vagrantfile
@@ -0,0 +1,60 @@
+### Documentation
+# This is a Vagrantfile for Beats development.
+#
+# Boxes
+# =====
+#
+# win2012
+# -------
+# This box is used as a Windows development and testing environment for Beats.
+#
+# Usage and Features:
+#   - Two users exist: Administartor and Vagrant. Both have the password: vagrant
+#   - Use 'vagrant ssh' to open a Windows command prompt.
+#   - Use 'vagrant rdp' to open a Windows Remote Deskop session. Mac users must
+#     install the Microsoft Remote Desktop Client from the App Store.
+#   - There is a desktop shortcut labeled "Beats Shell" that opens a command prompt
+#     to C:\Gopath\src\github.com\elastic\beats where the code is mounted.
+#
+# add more boxes here
+# -------------------
+# More development boxes can be added to this file and you can run commands
+# like "vagrant up solaris" or "vargrant up winxp" to start them.
+
+# Provisioning for Windows PowerShell
+$winPsProvision = <<SCRIPT
+echo 'Creating github.com\elastic in the GOPATH'
+New-Item -itemtype directory -path "C:\\Gopath\\src\\github.com\\elastic" -force
+echo "Symlinking C:\\Vagrant to C:\\Gopath\\src\\github.com\\elastic"
+cmd /c mklink /d C:\\Gopath\\src\\github.com\\elastic\\beats \\\\vboxsvr\\vagrant
+
+echo "Creating Beats Shell desktop shortcut"
+$WshShell = New-Object -comObject WScript.Shell
+$Shortcut = $WshShell.CreateShortcut("$Home\\Desktop\\Beats Shell.lnk")
+$Shortcut.TargetPath = "cmd.exe"
+$Shortcut.Arguments = "/K cd /d C:\\Gopath\\src\\github.com\\elastic\\beats"
+$Shortcut.Save()
+SCRIPT
+
+Vagrant.configure(2) do |config|
+
+  config.vm.define "win2012", primary: true do |win2012|
+    # Windows Server 2012 R2
+    win2012.vm.box = "https://s3.amazonaws.com/beats-files/vagrant/beats-win2012-r2-virtualbox.box"
+    win2012.vm.guest = :windows
+
+    # Communicator for windows boxes
+    win2012.vm.communicator = "winrm"
+
+    # Port forward WinRM and RDP
+    win2012.vm.network :forwarded_port, guest: 22,   host: 2222,  id: "ssh", auto_correct: true
+    win2012.vm.network :forwarded_port, guest: 3389, host: 33389, id: "rdp", auto_correct: true
+    win2012.vm.network :forwarded_port, guest: 5985, host: 55985, id: "winrm", auto_correct: true
+
+    win2012.vm.provision "shell", inline: $winPsProvision
+  end
+
+end
+
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
diff --git a/filebeat/Vagrantfile b/filebeat/Vagrantfile
deleted file mode 100644
index 668af3110709..000000000000
--- a/filebeat/Vagrantfile
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-### Documentation
-# This box is used as windows development and testing environment for filebeat
-# Two users exist: Administartor and Vagrant. Both have the password: vagrant
-
-Vagrant.configure(2) do |config|
-
-  # Windows Server 2012 R2
-  config.vm.box = "http://files.ruflin.com/vagrant/beats-20150925.box"
-
-  # Communicator for windows boxes
-  config.vm.communicator = "winrm"
-
-  # Port forward WinRM and RDP
-  config.vm.network :forwarded_port, guest: 3389, host: 3389
-  config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true
-
-  # Load current folder as C:\dev directory
-  config.vm.synced_folder ".", "/Gopath/src/github.com/elastic/filebeat"
-
-end
diff --git a/libbeat/Vagrantfile b/libbeat/Vagrantfile
deleted file mode 100644
index 78b54c35e903..000000000000
--- a/libbeat/Vagrantfile
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-### Documentation
-# This box is used as windows development and testing environment for libbeat
-# Two users exist: Administartor and Vagrant. Both have the password: vagrant
-
-Vagrant.configure(2) do |config|
-
-  # Windows Server 2012 R2
-  config.vm.box = "http://files.ruflin.com/vagrant/beats-20150925.box"
-
-  # Communicator for windows boxes
-  config.vm.communicator = "winrm"
-  #config.winrm.username = "admin"
-  #config.winrm.password = "beats"
-
-  # Port forward WinRM and RDP
-  config.vm.network :forwarded_port, guest: 22, host: 22
-  config.vm.network :forwarded_port, guest: 3389, host: 3389
-  config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true
-
-  # Load current folder as C:\dev directory
-  config.vm.synced_folder ".", "/Gopath/src/github.com/elastic/libbeat"
-
-end
diff --git a/winlogbeat/Vagrantfile b/winlogbeat/Vagrantfile
deleted file mode 100644
index dc2f53e28c58..000000000000
--- a/winlogbeat/Vagrantfile
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-### Documentation
-# This box is used as windows development and testing environment for filebeat
-# Two users exist: Administartor and Vagrant. Both have the password: vagrant
-
-Vagrant.configure(2) do |config|
-
-  # Windows Server 2012 R2
-  config.vm.box = "http://files.ruflin.com/vagrant/beats-20150925.box"
-
-  # Communicator for windows boxes
-  config.vm.communicator = "winrm"
-  config.winrm.username = "administrator"
-  config.winrm.password = "vagrant"
-
-  # Port forward WinRM and RDP
-  config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct: true
-  config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true
-
-  # Mount directories using SMB
-  Vagrant.configure("2") do |config|
-    # FIXME: This mount doesn't work because the elastic directory does not
-    # exist in the image.
-    config.vm.synced_folder ".", "/Gopath/src/github.com/elastic/winlogbeat", type: "smb"
-  end
-
-end