diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix
new file mode 100644
index 000000000000..0a2b908c9fd1
--- /dev/null
+++ b/pkgs/development/tools/gocode/default.nix
@@ -0,0 +1,18 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "gocode-${version}";
+  version = "20150904-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "680a0fbae5119fb0dbea5dca1d89e02747a80de0";
+  
+  goPackagePath = "github.com/nsf/gocode";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/nsf/gocode";
+    sha256 = "1ay2xakz4bcn8r3ylicbj753gjljvv4cj9l4wfly55cj1vjybjpv";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0afc7bff30ba..c206bab50962 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11151,7 +11151,7 @@ in
     inherit (gnome) gtk gtkmm;
   };
 
-  gocode = goPackages.gocode.bin // { outputs = [ "bin" ]; };
+  gocode = callPackage ../development/tools/gocode { };
 
   kgocode = callPackage ../applications/misc/kgocode {
     inherit (pkgs.kde4) kdelibs;
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index d1cc66f14497..cc6df9ddb218 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1063,14 +1063,6 @@ let
     propagatedBuildInputs = [ inf snappy groupcache ];
   };
 
-  gocode = buildFromGitHub {
-    rev = "680a0fbae5119fb0dbea5dca1d89e02747a80de0";
-    version = "2015-09-03";
-    owner = "nsf";
-    repo = "gocode";
-    sha256 = "1ay2xakz4bcn8r3ylicbj753gjljvv4cj9l4wfly55cj1vjybjpv";
-  };
-
   gocolorize = buildGoPackage rec {
     rev = "v1.0.0";
     name = "gocolorize-${rev}";