diff --git a/.gitmodules b/.gitmodules
index d6dd2eec..12b68c51 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -109,6 +109,6 @@
 [submodule "Alfred 2/Alfred.alfredpreferences/workflows/user.workflow.8694C3FC-8218-4B98-BB1F-F1CEC686477C"]
 	path = Alfred 2/Alfred.alfredpreferences/workflows/user.workflow.8694C3FC-8218-4B98-BB1F-F1CEC686477C
 	url = https://github.com/kejadlen/forecast.alfredworkflow.git
-[submodule ".vim/bundle/nerdcommenter"]
-	path = .vim/bundle/nerdcommenter
-	url = https://github.com/scrooloose/nerdcommenter.git
+[submodule ".vim/bundle/vim-commentary"]
+	path = .vim/bundle/vim-commentary
+	url = https://github.com/tpope/vim-commentary.git
diff --git a/.vim/bundle/nerdcommenter b/.vim/bundle/nerdcommenter
deleted file mode 160000
index 6549cfde..00000000
--- a/.vim/bundle/nerdcommenter
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6549cfde45339bd4f711504196ff3e8b766ef5e6
diff --git a/.vim/bundle/vim-commentary b/.vim/bundle/vim-commentary
new file mode 160000
index 00000000..9c685131
--- /dev/null
+++ b/.vim/bundle/vim-commentary
@@ -0,0 +1 @@
+Subproject commit 9c685131a5facfa0d643feca3a61b41c007d8170