diff --git a/pkgs/development/tools/goimports/default.nix b/pkgs/development/tools/goimports/default.nix
new file mode 100644
index 000000000000..91bd207581da
--- /dev/null
+++ b/pkgs/development/tools/goimports/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, lib, go, fetchurl, fetchgit, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  rev = "7534f4943d94a318edde90212439e538ed54cdde";
+  version = "git-2015-04-26";
+  name = "goimports-${version}";
+
+  buildInputs = [ go ];
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "golang";
+    repo = "tools";
+    sha256 = "12ybykrn92l7awav0wkx9yqpc5z0pdwwi29qs9mdr2xspx61rb50";
+  };
+
+  buildPhase = ''
+    export GOPATH=$src
+    go build -v -o goimports golang.org/x/tools/cmd/goimports
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv goimports $out/bin
+  '';
+
+  meta = with lib; {
+    description = "Import management tool for go";
+    homepage = https://godoc.org/golang.org/x/tools/cmd/goimports;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ jzellner ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1dd7dfc0a6bb..c488a1f99858 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9789,6 +9789,8 @@ let
 
   godep = callPackage ../development/tools/godep { };
 
+  goimports = callPackage ../development/tools/goimports { };
+
   gogoclient = callPackage ../os-specific/linux/gogoclient { };
 
   nss_ldap = callPackage ../os-specific/linux/nss_ldap { };