diff --git a/.gitignore b/.gitignore
index 7d1115a32..aebb84829 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,7 @@ pkg/
 /go-bindata
 release_version.go
 /machine*
+.vagrant/
+conf
+info
+log
diff --git a/Vagrantfile b/Vagrantfile
new file mode 100644
index 000000000..ec3de3765
--- /dev/null
+++ b/Vagrantfile
@@ -0,0 +1,31 @@
+# This Vagrantfile is targeted at developers. It can be used to build and run etcd in an isolated VM.
+
+$provision = <<SCRIPT
+
+apt-get update
+apt-get install -y python-software-properties git
+add-apt-repository -y ppa:duh/golang
+apt-get update
+apt-get install -y golang
+
+cd /vagrant && ./build
+
+/vagrant/etcd -c 0.0.0.0:4001 -s 0.0.0.0:7001 &
+
+SCRIPT
+
+
+Vagrant.configure("2") do |config|
+    config.vm.box = 'precise64'
+    config.vm.box_url = 'http://files.vagrantup.com/precise64.box'
+
+    config.vm.provider "virtualbox" do |vbox|
+        vbox.customize ["modifyvm", :id, "--memory", "1024"]
+    end
+
+    config.vm.provision "shell", inline: $provision
+
+    config.vm.network "forwarded_port", guest: 4001, host: 4001, auto_correct: true
+    config.vm.network "forwarded_port", guest: 7001, host: 7001, auto_correct: true
+
+end