diff --git a/pkgs/applications/networking/znc/1.4.nix b/pkgs/applications/networking/znc/1.4.nix
deleted file mode 100644
index fdd02aac0b5..00000000000
--- a/pkgs/applications/networking/znc/1.4.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, openssl, pkgconfig
-, withPerl ? false, perl
-, withPython ? false, python3
-, withTcl ? false, tcl
-, withCyrus ? true, cyrus_sasl
-}:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
-  name = "znc-1.4";
-
-  src = fetchurl {
-    url = "http://znc.in/releases/${name}.tar.gz";
-    sha256 = "0lkv58pq4d5lzcyx8v8anzinx0sx0zw0js4jij13jb8qxp88zsc6";
-  };
-
-  buildInputs = [ openssl pkgconfig ]
-    ++ optional withPerl perl
-    ++ optional withPython python3
-    ++ optional withTcl tcl
-    ++ optional withCyrus cyrus_sasl;
-
-  configureFlags = optionalString withPerl "--enable-perl "
-    + optionalString withPython "--enable-python "
-    + optionalString withTcl "--enable-tcl --with-tcl=${tcl}/lib "
-    + optionalString withCyrus "--enable-cyrus ";
-
-  meta = with stdenv.lib; {
-    description = "Advanced IRC bouncer";
-    homepage = http://wiki.znc.in/ZNC;
-    maintainers = with maintainers; [ viric ];
-    license = licenses.asl20;
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index 9836d1fbb3b..802c5f5ecb7 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -1,7 +1,6 @@
-{ stdenv, fetchurl, fetchgit,  znc }:
+{ stdenv, fetchurl, fetchgit, znc }:
 
 let
-
   zncDerivation = a@{
     name, src, module_name,
     buildPhase ? "${znc}/bin/znc-buildmod ${module_name}.cpp",
@@ -16,14 +15,93 @@ let
 
 in rec {
 
+  clientbuffer = zncDerivation rec {
+    name = "znc-clientbuffer-${version}";
+    version = "git-2015-08-27";
+    module_name = "clientbuffer";
+
+    src = fetchgit {
+      url = meta.repositories.git;
+      rev = "fe0f368e1fcab2b89d5c94209822d9b616cea840";
+      sha256 = "1knbkj1dm45s741qndsfclmk3pyxnihgwq2i1n75ip3wv8i1bf4b";
+    };
+
+    meta = with stdenv.lib; {
+      description = "ZNC module for client specific buffers";
+      homepage = https://github.com/jpnurmi/znc-clientbuffer;
+      repositories.git = https://github.com/jpnurmi/znc-clientbuffer.git;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ hrdinka ];
+    };
+  };
+
+  fish = zncDerivation rec {
+    name = "znc-fish-${version}";
+    version = "git-2014-10-10";
+    module_name = "fish";
+
+    src = fetchgit {
+      url = meta.repositories.git;
+      rev = "9c580e018a1a08374e814fc06f551281cff827de";
+      sha256 = "0yvs0jkwwp18qxqvw1dvir91ggczz56ka00k0zlsb81csdi8xfvl";
+    };
+
+    meta = {
+      description = "ZNC FiSH module";
+      homepage = https://github.com/dctrwatson/znc-fish;
+      # this fork works with ZNC 1.6
+      repositories.git = https://github.com/jarrydpage/znc-fish.git;
+      maintainers = [ stdenv.lib.maintainers.offline ];
+    };
+  };
+
+  playback = zncDerivation rec {
+    name = "znc-playback-${version}";
+    version = "git-2015-08-04";
+    module_name = "playback";
+
+    src = fetchgit {
+      url = meta.repositories.git;
+      rev = "8691abf75becc1f3d7b5bb5ad68dad17cd21863b";
+      sha256 = "0pd89p00yfir4lvw0107lc3qxzx8bgbm5lqq0lpwb6cahv3ipdra";
+    };
+
+    meta = with stdenv.lib; {
+      description = "An advanced playback module for ZNC";
+      homepage = https://github.com/jpnurmi/znc-playback;
+      repositories.git = https://github.com/jpnurmi/znc-playback.git;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ hrdinka ];
+    };
+  };
+
+  privmsg = zncDerivation rec {
+    name = "znc-privmsg-${version}";
+    version = "git-2015-02-22";
+    module_name = "privmsg";
+
+    src = fetchgit {
+      url = meta.repositories.git;
+      rev = "9f1f98db56cbbea96d83e6628f657e0d62cd9517";
+      sha256 = "0n82z87gdxxragcaixjc80z8bw4bmfwbk0jrf9zs8kk42phlkkc2";
+    };
+
+    meta = {
+      description = "ZNC privmsg module";
+      homepage = https://github.com/kylef/znc-contrib;
+      repositories.git = https://github.com/kylef/znc-contrib.git;
+    };
+  };
+
   push = zncDerivation rec {
     name = "znc-push-${version}";
-    version = "1.0.0";
+    version = "git-2015-12-07";
     module_name = "push";
 
-    src = fetchurl {
-        url = "https://github.com/jreese/znc-push/archive/v${version}.tar.gz";
-        sha256 = "1v9a16b1d8mfzhddf4drh6rbxa0szr842g7614r8ninmc0gi7a2v";
+    src = fetchgit {
+      url = "https://github.com/jreese/znc-push.git";
+      rev = "717a2b1741eee75456b0862ef76dbb5af906e936";
+      sha256 = "1lr5bhcy8156f7sbah7kjgz4g4mhkkwgvwjd2rxpbwnpq3ssza9k";
     };
 
     meta = {
@@ -35,39 +113,4 @@ in rec {
     };
   };
 
-  fish = zncDerivation rec {
-    name = "znc-fish-8e1f150fda";
-    module_name = "fish";
-
-    src = fetchgit {
-        url = meta.repositories.git;
-        rev = "8e1f150fdaf18dc33e023795584dec8255e6614e";
-        sha256 = "0vpk4336c191irl3g7wibblnbqf3903hjrci4gs0qgg1wvj7fw66";
-    };
-
-    meta = {
-      description = "ZNC FiSH module";
-      homepage = https://github.com/dctrwatson/znc-fish;
-      repositories.git = https://github.com/dctrwatson/znc-fish.git;
-      maintainers = [ stdenv.lib.maintainers.offline ];
-    };
-  };
-
-  privmsg = zncDerivation rec {
-    name        = "znc-privmsg-c9f98690be";
-    module_name = "privmsg";
-
-    src = fetchgit {
-      url    = meta.repositories.git;
-      rev    = "c9f98690beb4e3a7681468d5421ff11dc8e1ee8b";
-      sha256 = "dfeb28878b12b98141ab204191288cb4c3f7df153a01391ebf6ed6a32007247f";
-    };
-
-    meta = {
-      description = "ZNC privmsg module";
-      homepage = https://github.com/kylef/znc-contrib;
-      repositories.git = https://github.com/kylef/znc-contrib.git;
-    };
-  };
-
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 37f1098a823..3ed02f71e5c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16125,8 +16125,6 @@ let
 
   znc = callPackage ../applications/networking/znc { };
 
-  znc_14 = callPackage ../applications/networking/znc/1.4.nix { };
-
   zncModules = recurseIntoAttrs (
     callPackage ../applications/networking/znc/modules.nix { }
   );