diff --git a/.gitmodules b/.gitmodules
index b753cf35e..f0b7a7f73 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -49,3 +49,6 @@
 [submodule "bundle/vim-javascript"]
 	path = bundle/vim-javascript
 	url = git://github.com/franciscosouza/vim-javascript.git
+[submodule "bundle/vagrantfile"]
+	path = bundle/vagrantfile
+	url = git://github.com/robbevan/Vagrantfile.vim.git
diff --git a/bundle/vagrantfile b/bundle/vagrantfile
new file mode 160000
index 000000000..bf43ca83c
--- /dev/null
+++ b/bundle/vagrantfile
@@ -0,0 +1 @@
+Subproject commit bf43ca83ceb82585a5a0a053c7ad54e5e31ddead
diff --git a/plugin/vagrantfile.vim b/plugin/vagrantfile.vim
deleted file mode 100644
index 43994a00a..000000000
--- a/plugin/vagrantfile.vim
+++ /dev/null
@@ -1,10 +0,0 @@
-" Teach vim to syntax highlight Vagrantfile as ruby
-"
-" Install: $HOME/.vim/plugin/vagrant.vim
-" Author: Brandon Philips <brandon@ifup.org>
-
-augroup vagrant
-	au!
-	au BufRead,BufNewFile Vagrantfile set filetype=ruby
-augroup END
-