diff --git a/.gitmodules b/.gitmodules
index 5eb1fc2..ea3f418 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -46,9 +46,9 @@
 [submodule "bundle/quickfixsigns.vim"]
 	path = bundle/quickfixsigns.vim
 	url = https://github.com/tomtom/quickfixsigns_vim.git
-[submodule "bundle/golang.vim"]
-	path = bundle/golang.vim
-	url = https://github.com/jnwhiteh/vim-golang.git
 [submodule "bundle/gitv.vim"]
 	path = bundle/gitv.vim
 	url = https://github.com/gregsexton/gitv.git
+[submodule "bundle/gocode.vim"]
+	path = bundle/gocode.vim
+	url = https://github.com/Blackrush/vim-gocode.git
diff --git a/bundle/gocode.vim b/bundle/gocode.vim
new file mode 160000
index 0000000..76f1ece
--- /dev/null
+++ b/bundle/gocode.vim
@@ -0,0 +1 @@
+Subproject commit 76f1ece5b6950f64f56f3c5d70a3c33e4f1e25af
diff --git a/bundle/golang.vim b/bundle/golang.vim
deleted file mode 160000
index 43a8205..0000000
--- a/bundle/golang.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 43a820591b4cb3ee8fcf759940e83d105b3a5d85