diff --git a/.gitmodules b/.gitmodules
index 8e9e3c3..394ab36 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,7 +6,7 @@
 	url = git://github.com/tpope/vim-fugitive.git
 [submodule "bundle/surround"]
 	path = bundle/surround
-	url = git://github.com/tpope/vim-surround.git
+	url = git://github.com/jinfield/vim-surround.git
 [submodule "bundle/rails"]
 	path = bundle/rails
 	url = git://github.com/tpope/vim-rails.git
diff --git a/bundle/fontsize b/bundle/fontsize
index 3b114e2..1be393a 160000
--- a/bundle/fontsize
+++ b/bundle/fontsize
@@ -1 +1 @@
-Subproject commit 3b114e2935f60ba5711061662f2f97e9075ec948
+Subproject commit 1be393ad25a503a5c5d6fd1ef77533e5785aed0f
diff --git a/bundle/surround b/bundle/surround
index 27710a2..13a460a 160000
--- a/bundle/surround
+++ b/bundle/surround
@@ -1 +1 @@
-Subproject commit 27710a2224d6dd0486d1c40d09ef18dd752e7d37
+Subproject commit 13a460a43c413873d442a7ab2dabcb6547807b80
diff --git a/bundle/xptemplate b/bundle/xptemplate
index 748a7c4..71877c7 160000
--- a/bundle/xptemplate
+++ b/bundle/xptemplate
@@ -1 +1 @@
-Subproject commit 748a7c463b986b65de72ef80c580f6c18a3bb932
+Subproject commit 71877c71d3dcbaada1419b69eb2be0d473b72054