diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index cf72b0495968..b15f4542fb55 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -459,6 +459,7 @@
   vbgl = "Vincent Laporte <Vincent.Laporte@gmail.com>";
   vbmithr = "Vincent Bernardoff <vb@luminar.eu.org>";
   vcunat = "Vladimír Čunát <vcunat@gmail.com>";
+  vdemeester = "Vincent Demeester <vincent@sbr.pm>";
   veprbl = "Dmitry Kalinkin <veprbl@gmail.com>";
   viric = "Lluís Batlle i Rossell <viric@viric.name>";
   vizanto = "Danny Wilson <danny@prime.vc>";
diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix
new file mode 100644
index 000000000000..ddb136ed86ea
--- /dev/null
+++ b/pkgs/development/tools/godef/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, lib, buildGoPackage, fetchgit }:
+
+buildGoPackage rec {
+  name = "godef-${version}";
+  version = "20160620-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "ee532b944160bb27b6f23e4f5ef38b8fdaa2a6bd";
+
+  goPackagePath = "github.com/rogpeppe/godef";
+  excludedPackages = "go/printer/testdata";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/rogpeppe/godef";
+    sha256 = "1r8c4ijjnwvb9pci4wasmq88yj0ginwly2542kw4hyg2c87j613l";
+  };
+
+  meta = {
+    description = "Print where symbols are defined in Go source code";
+    homepage = "https://github.com/rogpeppe/godef/";
+    maintainers = with stdenv.lib.maintainers; [ vdemeester ];
+    licence = stdenv.lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 196546f959f1..2a91aed01ddf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11242,6 +11242,8 @@ in
 
   godep = callPackage ../development/tools/godep { };
 
+  godef = callPackage ../development/tools/godef { };
+
   goimports = callPackage ../development/tools/goimports { };
 
   govers = callPackage ../development/tools/govers { };