diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 32044808f86..be7440fb733 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -40,8 +40,8 @@
     "fetch": {
       "type": "git",
       "url": "https://go.googlesource.com/crypto",
-      "rev": "1f22c0103821b9390939b6776727195525381532",
-      "sha256": "05ahvn9g9cj7797n8ryfxv2g26v3lx1pza9d9pg97iw0rvar9i1h"
+      "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6",
+      "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"
     }
   },
   {
@@ -763,5 +763,131 @@
       "rev": "9232a6386b737d7d1e5c1c6e817aa48d5d8ee7cd",
       "sha256": "056mcqrf2bv0g9gn2ixv19srk613h4sasl99w9375mpvmadb3pz1"
     }
+  },
+  {
+    "goPackagePath": "github.com/armon/go-metrics",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/armon/go-metrics",
+      "rev": "b2d95e5291cdbc26997d1301a5e467ecbb240e25",
+      "sha256": "1jvdf98jlbyzbb9w159nifvv8fihrcs66drnl8pilqdjpmkmyyck"
+    }
+  },
+  {
+    "goPackagePath": "github.com/mattn/go-isatty",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mattn/go-isatty",
+      "rev": "ae0b1f8f8004be68d791a576e3d8e7648ab41449",
+      "sha256": "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj"
+    }
+  },
+  {
+    "goPackagePath": "github.com/hashicorp/logutils",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hashicorp/logutils",
+      "rev": "0dc08b1671f34c4250ce212759ebd880f743d883",
+      "sha256": "0rynhjwvacv9ibl2k4fwz0xy71d583ac4p33gm20k9yldqnznc7r"
+    }
+  },
+  {
+    "goPackagePath": "github.com/armon/go-radix",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/armon/go-radix",
+      "rev": "fbd82e84e2b13651f3abc5ffd26b65ba71bc8f93",
+      "sha256": "16y64r1v054c2ln0bi5mrqq1cmvy6d6pnxk1glb8lw2g31ksa80c"
+    }
+  },
+  {
+    "goPackagePath": "github.com/hashicorp/go-syslog",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hashicorp/go-syslog",
+      "rev": "42a2b573b664dbf281bd48c3cc12c086b17a39ba",
+      "sha256": "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3"
+    }
+  },
+  {
+    "goPackagePath": "github.com/hashicorp/memberlist",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hashicorp/memberlist",
+      "rev": "6025015f2dc659ca2c735112d37e753bda6e329d",
+      "sha256": "01s2gwnbgvwz4wshz9d4za0p12ji4fnapnlmz3jwfcmcwjpyqfb7"
+    }
+  },
+  {
+    "goPackagePath": "github.com/mitchellh/mapstructure",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mitchellh/mapstructure",
+      "rev": "281073eb9eb092240d33ef253c404f1cca550309",
+      "sha256": "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"
+    }
+  },
+  {
+    "goPackagePath": "github.com/armon/circbuf",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/armon/circbuf",
+      "rev": "f092b4f207b6e5cce0569056fba9e1a2735cb6cf",
+      "sha256": "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s"
+    }
+  },
+  {
+    "goPackagePath": "github.com/hashicorp/mdns",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hashicorp/mdns",
+      "rev": "2b439d37011456df8ff83a70ffd1cd6046410113",
+      "sha256": "17zwk212zmyramnjylpvvrvbbsz0qb5crkhly6yiqkyll3qzpb96"
+    }
+  },
+  {
+    "goPackagePath": "github.com/mitchellh/cli",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mitchellh/cli",
+      "rev": "8102d0ed5ea2709ade1243798785888175f6e415",
+      "sha256": "08mj1l94pww72jy34gk9a483hpic0rrackskfw13r3ycy997w7m2"
+    }
+  },
+  {
+    "goPackagePath": "github.com/ryanuber/columnize",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/ryanuber/columnize",
+      "rev": "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a",
+      "sha256": "1qrqr76cw58x2hkjic6h88na5ihgvkmp8mqapj8kmjcjzdxkzhr9"
+    }
+  },
+  {
+    "goPackagePath": "github.com/hashicorp/go-msgpack",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hashicorp/go-msgpack",
+      "rev": "fa3f63826f7c23912c15263591e65d54d080b458",
+      "sha256": "1f6rd6bm2dm2rk46x8cqrxh5nks1gpk6dvvsag7s5pdjgdxy951k"
+    }
+  },
+  {
+    "goPackagePath": "github.com/hashicorp/go.net",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hashicorp/go.net",
+      "rev": "104dcad90073cd8d1e6828b2af19185b60cf3e29",
+      "sha256": "0pfi09h4q6w2x833qxr8r609ml4kw1flqm265j752sb08sbf3zwf"
+    }
+  },
+  {
+    "goPackagePath": "golang.org/x/crypto",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/hashicorp/go.net",
+      "rev": "104dcad90073cd8d1e6828b2af19185b60cf3e29",
+      "sha256": "0pfi09h4q6w2x833qxr8r609ml4kw1flqm265j752sb08sbf3zwf"
+    }
   }
 ]
diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix
new file mode 100644
index 00000000000..5f4c6453de7
--- /dev/null
+++ b/pkgs/servers/serf/default.nix
@@ -0,0 +1,20 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "serf-${version}";
+  version = "20150515-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "668982d8f90f5eff4a766583c1286393c1d27f68";
+
+  goPackagePath = "github.com/hashicorp/serf";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/hashicorp/serf";
+    sha256 = "1h05h5xhaj27r1mh5zshnykax29lqjhfc0bx4v9swiwb873c24qk";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/servers/serf/deps.json b/pkgs/servers/serf/deps.json
new file mode 100644
index 00000000000..3f13d068479
--- /dev/null
+++ b/pkgs/servers/serf/deps.json
@@ -0,0 +1,23 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/armon/go-metrics",
+      "github.com/mattn/go-isatty",
+      "github.com/hashicorp/logutils",
+      "github.com/armon/go-radix",
+      "github.com/bgentry/speakeasy",
+      "github.com/hashicorp/go-syslog",
+      "github.com/hashicorp/memberlist",
+      "github.com/mitchellh/mapstructure",
+      "github.com/armon/circbuf",
+      "github.com/hashicorp/go-msgpack",
+      "github.com/hashicorp/go.net",
+      "github.com/hashicorp/mdns",
+      "github.com/mitchellh/cli",
+      "github.com/ryanuber/columnize",
+      "github.com/miekg/dns",
+      "golang.org/x/crypto"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea012bbc933..0afc7bff30b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10274,7 +10274,7 @@ in
 
   shairport-sync = callPackage ../servers/shairport-sync { };
 
-  serfdom = goPackages.serf.bin // { outputs = [ "bin" ]; };
+  serfdom = callPackage ../servers/serf { };
 
   seyren = callPackage ../servers/monitoring/seyren { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index fe3cc14926b..d1cc66f1449 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3339,19 +3339,6 @@ let
     sha256 = "19ifi0na4cj23q3h8xv89mx7p48y0ciymhmlrq9milm0xz80wk10";
   };
 
-  serf = buildFromGitHub {
-    rev = "668982d8f90f5eff4a766583c1286393c1d27f68";
-    version = "2015-05-15";
-    owner  = "hashicorp";
-    repo   = "serf";
-    sha256 = "1h05h5xhaj27r1mh5zshnykax29lqjhfc0bx4v9swiwb873c24qk";
-
-    buildInputs = [
-      circbuf armon.go-metrics ugorji.go go-syslog logutils mdns memberlist
-      cli mapstructure columnize
-    ];
-  };
-
   sets = buildGoPackage rec {
     rev = "6c54cb57ea406ff6354256a4847e37298194478f";
     name = "sets-${stdenv.lib.strings.substring 0 7 rev}";