diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix
index a617e582c980..9d404546d008 100644
--- a/pkgs/development/tools/golint/default.nix
+++ b/pkgs/development/tools/golint/default.nix
@@ -2,17 +2,29 @@
 
 buildGoPackage rec {
   name = "lint-${version}";
-  version = "20180208-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "e14d9b0f1d332b1420c1ffa32562ad2dc84d645d";
+  version = "20181026-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "c67002cb31c3a748b7688c27f20d8358b4193582";
   
-  goPackagePath = "github.com/golang/lint";
+  goPackagePath = "golang.org/x/lint";
   excludedPackages = "testdata";
 
+  # we must allow references to the original `go` package, as golint uses
+  # compiler go/build package to load the packages it's linting.
+  allowGoReference = true;
+
   src = fetchgit {
     inherit rev;
-    url = "https://github.com/golang/lint";
-    sha256 = "15ynf78v39n71aplrhbqvzfblhndp8cd6lnknm586sdl81wama6p";
+    url = "https://go.googlesource.com/lint";
+    sha256 = "0gymbggskjmphqxqcx4s0vnlcz7mygbix0vhwcwv5r67c0bf6765";
   };
 
   goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    homepage = https://golang.org;
+    description = "Linter for Go source code";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ jhillyerd ];
+    platforms = platforms.all;
+  };
 }
diff --git a/pkgs/development/tools/golint/deps.nix b/pkgs/development/tools/golint/deps.nix
index caf3615c666b..e26400989338 100644
--- a/pkgs/development/tools/golint/deps.nix
+++ b/pkgs/development/tools/golint/deps.nix
@@ -1,11 +1,12 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
 [
   {
     goPackagePath = "golang.org/x/tools";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/tools";
-      rev = "66487607e2081c7c2af2281c62c14ee000d5024b";
-      sha256 = "03wiraqkms4jb5gi7vmp52mpmp4av08yw4gr2nk31c2rnhyd3jv4";
+      rev = "91f80e683c10fea00e7f965a1a7cac482ce52541";
+      sha256 = "16a2vppy5hnp663f28yak6592l8p968ihsc91pigamxx3vk1qh5d";
     };
   }
 ]