diff --git a/pkgs/servers/serfdom/default.nix b/pkgs/servers/serfdom/default.nix
index 381fe6ddc1e..94a46459d4e 100644
--- a/pkgs/servers/serfdom/default.nix
+++ b/pkgs/servers/serfdom/default.nix
@@ -3,7 +3,7 @@
 with goPackages;
 
 buildGoPackage rec {
-  version = "0.6.3";
+  version = "0.6.4";
   name = "serfdom-${version}";
   goPackagePath = "github.com/hashicorp/serf";
 
@@ -11,10 +11,10 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = "serf";
     rev = "v${version}";
-    sha256 = "0ck77ji28bvm4ahzxyyi4sm17c3fxc16k0k5mihl1nlkgdd73m8y";
+    sha256 = "1fhz8wrvsmgaky22n255w9hkyfph2n45c47ivdyzrrxisg5j2438";
   };
 
-  buildInputs = [ cli mapstructure memberlist logutils go-syslog mdns columnize circbuf ];
+  buildInputs = [ cli mapstructure memberlist_v2 logutils go-syslog mdns columnize circbuf ugorji.go ];
 
   dontInstallSrc = true;
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index f6b8bfccfe8..080fc1d6747 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1601,6 +1601,21 @@ let
     propagatedBuildInputs = [ ugorji.go armon.go-metrics ];
   };
 
+  memberlist_v2 = buildGoPackage rec {
+    rev = "165267096ca647f00cc0b59a8f1ede9a96cbfbb1";
+    name = "memberlist-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/hashicorp/memberlist";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "hashicorp";
+      repo = "memberlist";
+      sha256 = "09lh79xqy7q0gy23x22lpfwihb5acr750vxl2fx0i4b88kq1vrzh";
+    };
+
+    propagatedBuildInputs = [ ugorji.go armon.go-metrics ];
+  };
+
   mesos-stats = buildGoPackage rec {
     rev = "0c6ea494c19bedc67ebb85ce3d187ec21050e920";
     name = "mesos-stats-${stdenv.lib.strings.substring 0 7 rev}";