diff --git a/.gitmodules b/.gitmodules
index 24f4fa0..f738d7d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "vim/bundle/snipmate"]
-	path = vim/bundle/snipmate
-	url = https://github.com/xbudex/snipmate.vim.git
 [submodule "vim/bundle/wombat"]
 	path = vim/bundle/wombat
 	url = https://github.com/vim-scripts/Wombat.git
@@ -73,3 +70,6 @@
 [submodule "vim/bundle/editorconfig"]
 	path = vim/bundle/editorconfig
 	url = https://github.com/editorconfig/editorconfig-vim.git
+[submodule "vim/bundle/ultisnips"]
+	path = vim/bundle/ultisnips
+	url = https://github.com/SirVer/ultisnips.git
diff --git a/vim/bundle/snipmate b/vim/bundle/snipmate
deleted file mode 160000
index a7262a2..0000000
--- a/vim/bundle/snipmate
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a7262a21bbd88245ac234a681549d3db521ea2ba
diff --git a/vim/bundle/ultisnips b/vim/bundle/ultisnips
new file mode 160000
index 0000000..43b1cbd
--- /dev/null
+++ b/vim/bundle/ultisnips
@@ -0,0 +1 @@
+Subproject commit 43b1cbd9585319c399e33f9e9f611dabedc37781