diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e06e2d31d74d..0f6a2be4bfbc 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8257,6 +8257,12 @@
     githubId = 203195;
     name = "Szczyp";
   };
+  szlend = {
+    email = "pub+nix@zlender.si";
+    github = "szlend";
+    githubId = 7301807;
+    name = "Simon Žlender";
+  };
   sztupi = {
     email = "attila.sztupak@gmail.com";
     github = "sztupi";
diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index 3fd447b8b096..c045598fc3b5 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -39,21 +39,21 @@ in {
 
   clientbuffer = zncDerivation rec {
     name = "znc-clientbuffer-${version}";
-    version = "git-2015-08-27";
+    version = "git-2020-04-24";
     module_name = "clientbuffer";
 
     src = fetchFromGitHub {
-      owner = "jpnurmi";
+      owner = "CyberShadow";
       repo = "znc-clientbuffer";
-      rev = "fe0f368e1fcab2b89d5c94209822d9b616cea840";
-      sha256 = "1s8bqqlwy9kmcpmavil558rd2b0wigjlzp2lpqpcqrd1cg25g4a7";
+      rev = "2e32d508aa975c0a307d09575a0198f8c56c11fa";
+      sha256 = "1jaspnrbv3pzsnbysqygc8s8g3q07zx5nlrdpgwv9j8aryg0pcnh";
     };
 
     meta = with stdenv.lib; {
       description = "ZNC module for client specific buffers";
-      homepage = "https://github.com/jpnurmi/znc-clientbuffer";
+      homepage = "https://github.com/CyberShadow/znc-clientbuffer";
       license = licenses.asl20;
-      maintainers = with maintainers; [ hrdinka ];
+      maintainers = with maintainers; [ hrdinka szlend ];
     };
   };