diff --git a/.gitmodules b/.gitmodules
index 76e46808..a90ee779 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -85,3 +85,21 @@
 [submodule "bundle/ctrlp.vim"]
 	path = bundle/ctrlp.vim
 	url = git@github.com:kien/ctrlp.vim.git
+[submodule "bundle/tlib"]
+	path = bundle/tlib
+	url = git@github.com:tomtom/tlib_vim.git
+[submodule "bundle/vim-addon-mw-utils"]
+	path = bundle/vim-addon-mw-utils
+	url = git@github.com:MarcWeber/vim-addon-mw-utils.git
+[submodule "vim-snipmate"]
+	path = vim-snipmate
+	url = git@github.com:garbas/vim-snipmate.git
+[submodule "bundle/vim-snipmate"]
+	path = bundle/vim-snipmate
+	url = git@github.com:garbas/vim-snipmate.git
+[submodule "bundle/vim-snippets"]
+	path = bundle/vim-snippets
+	url = git@github.com:honza/vim-snippets.git
+[submodule "bundle/snipmate-snippets"]
+	path = bundle/snipmate-snippets
+	url = git@github.com:scrooloose/snipmate-snippets.git
diff --git a/bundle/snipmate-snippets b/bundle/snipmate-snippets
new file mode 160000
index 00000000..15cb6bf4
--- /dev/null
+++ b/bundle/snipmate-snippets
@@ -0,0 +1 @@
+Subproject commit 15cb6bf4fad5b11f83d2ddb7186aadc0604329c1
diff --git a/bundle/tlib b/bundle/tlib
new file mode 160000
index 00000000..c9ffbef0
--- /dev/null
+++ b/bundle/tlib
@@ -0,0 +1 @@
+Subproject commit c9ffbef0718a35bd30eb711456e2100e4adf79f7
diff --git a/bundle/vim-addon-mw-utils b/bundle/vim-addon-mw-utils
new file mode 160000
index 00000000..0c5612fa
--- /dev/null
+++ b/bundle/vim-addon-mw-utils
@@ -0,0 +1 @@
+Subproject commit 0c5612fa31ee434ba055e21c76f456244b3b5109
diff --git a/bundle/vim-snipmate b/bundle/vim-snipmate
new file mode 160000
index 00000000..2d3e8ddc
--- /dev/null
+++ b/bundle/vim-snipmate
@@ -0,0 +1 @@
+Subproject commit 2d3e8ddc4424088d8e19c33764fff077f3116f55
diff --git a/bundle/vim-snippets b/bundle/vim-snippets
new file mode 160000
index 00000000..69c91817
--- /dev/null
+++ b/bundle/vim-snippets
@@ -0,0 +1 @@
+Subproject commit 69c918175c77c0a0516c3ab587509a3eca38b3ae
diff --git a/my_configs.vim b/my_configs.vim
index 3aaca983..67f06031 100644
--- a/my_configs.vim
+++ b/my_configs.vim
@@ -96,3 +96,6 @@ map <Leader>t :call RunCurrentSpecFile()<CR>
 map <Leader>s :call RunNearestSpec()<CR>
 map <Leader>l :call RunLastSpec()<CR>
 map <Leader>a :call RunAllSpecs()<CR>
+
+" Activate snipmate
+ActivateAddons vim-snippets snipmate