diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix
deleted file mode 100644
index 9cd6ccca388..00000000000
--- a/pkgs/tools/security/kbfs/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
-  name = "kbfs-${version}";
-  version = "2.11.0";
-
-  goPackagePath = "github.com/keybase/kbfs";
-  subPackages = [ "kbfsfuse" "kbfsgit/git-remote-keybase" ];
-
-  dontRenameImports = true;
-
-  src = fetchFromGitHub {
-    owner = "keybase";
-    repo = "kbfs";
-    rev = "v${version}";
-    sha256 = "1qlns7vpyj3ivm7d3vvlmx3iksl7hpcg87yh30f3n64c8jk0xc83";
-  };
-
-  buildFlags = [ "-tags production" ];
-
-  meta = with stdenv.lib; {
-    homepage = https://www.keybase.io;
-    description = "The Keybase FS FUSE driver";
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ rvolosatovs bennofs np ];
-    license = licenses.bsd3;
-  };
-}
diff --git a/pkgs/tools/security/keybase/kbfs.nix b/pkgs/tools/security/keybase/kbfs.nix
new file mode 100644
index 00000000000..302e996213d
--- /dev/null
+++ b/pkgs/tools/security/keybase/kbfs.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, keybase }:
+
+buildGoPackage rec {
+  pname = "kbfs";
+
+  inherit (keybase) src version;
+
+  goPackagePath = "github.com/keybase/client";
+  subPackages = [ "go/kbfs/kbfsfuse" "go/kbfs/kbfsgit/git-remote-keybase" ];
+
+  dontRenameImports = true;
+
+  buildFlags = [ "-tags production" ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://keybase.io/docs/kbfs";
+    description = "The Keybase filesystem";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ rvolosatovs bennofs np ];
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba8d7cfede6..c437ee3fd42 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3992,7 +3992,7 @@ in
     inherit (darwin.apple_sdk.frameworks) AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox;
   };
 
-  kbfs = callPackage ../tools/security/kbfs { };
+  kbfs = callPackage ../tools/security/keybase/kbfs.nix { };
 
   keybase-gui = callPackage ../tools/security/keybase/gui.nix { };