diff --git a/.gitmodules b/.gitmodules
index 440302a204..d5462c6c7b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -15,7 +15,7 @@
 	url = https://github.com/kennethreitz/requests
 [submodule "third_party/gocode"]
 	path = third_party/gocode
-	url = https://github.com/nsf/gocode.git
+	url = https://github.com/mdempsky/gocode.git
 [submodule "third_party/jedi"]
 	path = third_party/jedi
 	url = https://github.com/davidhalter/jedi
diff --git a/third_party/gocode b/third_party/gocode
index 843b7a63f6..00e7f5ac29 160000
--- a/third_party/gocode
+++ b/third_party/gocode
@@ -1 +1 @@
-Subproject commit 843b7a63f621bb441274849d58671870adf1a5ce
+Subproject commit 00e7f5ac290aeb20a3d8d31e737ae560a191a1d5