diff --git a/.gitignore b/.gitignore
index 729ccf4299f..fe9a6c0a99f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,8 @@ rpm-build
 .pydevproject
 # PyCharm stuff...
 .idea
+#IntelliJ IDEA stuff..
+*.iml
 # Mac OS X stuff...
 .DS_Store
 # manpage build stuff...
diff --git a/plugins/inventory/vagrant.py b/plugins/inventory/vagrant.py
new file mode 100755
index 00000000000..a98b3cdbe88
--- /dev/null
+++ b/plugins/inventory/vagrant.py
@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+"""
+Vagrant external inventory script. Automatically finds the IP of the booted vagrant system, and
+returns it under the host group 'vagrant'
+
+Example Vagrant configuration using this script:
+
+    config.vm.provision :ansible do |ansible|
+      ansible.playbook = "./provision/your_playbook.yml"
+      ansible.inventory_file = "./provision/inventory/vagrant.py"
+      ansible.verbose = true
+    end
+"""
+
+# Copyright (C) 2013  Mark Mandel <mark@compoundtheory.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import subprocess
+import re
+
+output = subprocess.check_output(["vagrant", "ssh-config"])
+ip = re.search("HostName ([0-9\.]+)", output).group(1)
+
+print '{ "vagrant" : ["'+ ip +'"] }'
\ No newline at end of file