diff --git a/pkgs/development/tools/go-bindata-assetfs/default.nix b/pkgs/development/tools/go-bindata-assetfs/default.nix
new file mode 100644
index 000000000000..249fc21cdfe4
--- /dev/null
+++ b/pkgs/development/tools/go-bindata-assetfs/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "go-bindata-assetfs-${version}";
+  version = "20160814-${rev}";
+  rev = "e1a2a7e";
+  goPackagePath = "github.com/elazarl/go-bindata-assetfs";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "elazarl";
+    repo = "go-bindata-assetfs";
+    sha256 = "0b6q8h9fwpgpkvml1j87wq9174g7px1dmskhm884drpvswda2djk";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Serve embedded files from jteeuwen/go-bindata";
+    license = licenses.bsd2;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ avnik ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e6a3f16f569..9f6f634235d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11232,6 +11232,8 @@ in
 
   go-bindata = callPackage ../development/tools/go-bindata { };
 
+  go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { };
+
   gocode = callPackage ../development/tools/gocode { };
 
   kgocode = callPackage ../applications/misc/kgocode {