diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
new file mode 100644
index 00000000000..6ce338d3a45
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix
@@ -0,0 +1,27 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "xmpp-client-${version}";
+  version = "20160110-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "525bd26cf5f56ec5aee99464714fd1d019c119ff";
+
+  goPackagePath = "github.com/agl/xmpp-client";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/agl/xmpp-client";
+    sha256 = "0a1r08zs723ikcskmn6ylkdi3frcd0i0lkx30i9q39ilf734v253";
+  };
+
+  goDeps = ./deps.json;
+
+  meta = with stdenv.lib; {
+    description = "An XMPP client with OTR support";
+    homepage = https://github.com/agl/xmpp-client;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ codsl ];
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/deps.json b/pkgs/applications/networking/instant-messengers/xmpp-client/deps.json
new file mode 100644
index 00000000000..a5fd7fc3aa7
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/xmpp-client/deps.json
@@ -0,0 +1,9 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "golang.org/x/crypto",
+      "golang.org/x/net"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 801a8d94d70..d4d89470092 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14867,7 +14867,7 @@ in
     GConf2 = gnome2.GConf;
   };
 
-  xmpp-client = goPackages.xmpp-client.bin // { outputs = [ "bin" ]; };
+  xmpp-client = callPackage ../applications/networking/instant-messengers/xmpp-client { };
 
   libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 8ac969a8877..9f7bc30f688 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3490,23 +3490,6 @@ let
     sha256 = "0gljdfxqc94yb1kpqqrm5p94ph9dsxrzcixhdj6m92cwwa7z7p99";
   };
 
-  xmpp-client = buildFromGitHub {
-    rev      = "525bd26cf5f56ec5aee99464714fd1d019c119ff";
-    version  = "2016-01-10";
-    owner    = "agl";
-    repo     = "xmpp-client";
-    sha256   = "0a1r08zs723ikcskmn6ylkdi3frcd0i0lkx30i9q39ilf734v253";
-    disabled = isGo14;
-    buildInputs = [ crypto net ];
-
-    meta = with stdenv.lib; {
-      description = "An XMPP client with OTR support";
-      homepage = https://github.com/agl/xmpp-client;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ codsl ];
-    };
-  };
-
   yaml-v1 = buildGoPackage rec {
     name = "yaml-v1-${version}";
     version = "git-2015-05-01";