diff --git a/pkgs/tools/wayland/cliphist/default.nix b/pkgs/by-name/cl/cliphist/package.nix
similarity index 61%
rename from pkgs/tools/wayland/cliphist/default.nix
rename to pkgs/by-name/cl/cliphist/package.nix
index 0cbb856162b2..7c8e6c73a140 100644
--- a/pkgs/tools/wayland/cliphist/default.nix
+++ b/pkgs/by-name/cl/cliphist/package.nix
@@ -2,25 +2,30 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  nix-update-script,
 }:
 
 buildGoModule rec {
   pname = "cliphist";
-  version = "0.5.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "sentriz";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-U78G7X9x3GQg3qcBINni8jWa0wSXQu+TjYChuRPPcLE=";
+    repo = "cliphist";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-tImRbWjYCdIY8wVMibc5g5/qYZGwgT9pl4pWvY7BDlI=";
   };
 
-  vendorHash = "sha256-O4jOFWygmFxm8ydOq1xtB1DESyWpFGXeSp8a6tT+too=";
+  vendorHash = "sha256-gG8v3JFncadfCEUa7iR6Sw8nifFNTciDaeBszOlGntU=";
 
   postInstall = ''
     cp ${src}/contrib/* $out/bin/
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     description = "Wayland clipboard manager";
     homepage = "https://github.com/sentriz/cliphist";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb4244945335..55f814f4e4c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4416,8 +4416,6 @@ with pkgs;
 
   clapboard = callPackage ../tools/wayland/clapboard { };
 
-  cliphist = callPackage ../tools/wayland/cliphist { };
-
   clipman = callPackage ../tools/wayland/clipman { };
 
   kabeljau = callPackage ../games/kabeljau { };