diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix
new file mode 100644
index 000000000000..9a1269815afb
--- /dev/null
+++ b/pkgs/tools/misc/asciinema/default.nix
@@ -0,0 +1,19 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "asciinema-${version}";
+  version = "20160520-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "6683bdaa263d0ce3645b87fe54aa87276b89988a";
+
+  
+  goPackagePath = "github.com/asciinema/asciinema";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/asciinema/asciinema";
+    sha256 = "08jyvnjpd5jdgyvkly9fswac4p10bqim5v4rhmivpg4y8pbcmxkz";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a45a56161617..d2e5535db8f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -446,7 +446,7 @@ in
 
   ascii = callPackage ../tools/text/ascii { };
 
-  asciinema = goPackages.asciinema.bin // { outputs = [ "bin" ]; };
+  asciinema = (callPackage ../tools/misc/asciinema {}).bin;
 
   asymptote = callPackage ../tools/graphics/asymptote {
     texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super; };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 619d4c60f1d6..80e3d590c688 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -250,13 +250,6 @@ let
     sha256 = "0b38mrfm3rwgdi7hrp4gjhf0y0f6bw73qjkfrkafxjrdpdg7nyly";
   };
 
-  asciinema = buildFromGitHub {
-    rev = "v1.2.0";
-    owner = "asciinema";
-    repo = "asciinema";
-    sha256 = "0wvrq92ackhfycfs1fircs8al3ji69igqqrc55ic29wbpnvz355x";
-  };
-
   asmfmt = buildFromGitHub {
     rev = "7971758b0c6584f67d745c62d006814ae7b44e9d";
     owner = "klauspost";