diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 23a3287c8cee..04145c03065e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6070,6 +6070,14 @@
     name = "Dee Engan";
     keys = [ { fingerprint = "9C24 79F5 F0CE 48F4 00EE  4A5B B8ED 46EB 468B F72D"; } ];
   };
+  deej-io = {
+    email = "me@deej.io";
+    github = "deej-io";
+    githubId = 7419862;
+    name = "Daniel Rollins";
+    matrix = "@deej-io:matrix.org";
+    keys = [ { fingerprint = "A0BE BED3 A3A0 7127 1411 6234 6830 B0AE 30DD 38DB"; } ];
+  };
   deejayem = {
     email = "nixpkgs.bu5hq@simplelogin.com";
     github = "deejayem";
diff --git a/pkgs/by-name/en/enpass-cli/package.nix b/pkgs/by-name/en/enpass-cli/package.nix
new file mode 100644
index 000000000000..4b973979fff9
--- /dev/null
+++ b/pkgs/by-name/en/enpass-cli/package.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  sqlcipher,
+  pkg-config,
+  nix-update-script,
+}:
+
+buildGoModule rec {
+  pname = "enpass-cli";
+  version = "1.6.5";
+
+  src = fetchFromGitHub {
+    owner = "HazCod";
+    repo = "enpass-cli";
+    tag = "v${version}";
+    hash = "sha256-13AhK0qDDANEgicggy1Sdlmo5b0Vlf2sEDzJerhUvG8=";
+  };
+
+  vendorHash = "sha256-7K7gdMjJ4cfv6xmuI73U+oW9JlmdN6wGg8vMcD/YThQ=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    sqlcipher
+  ];
+
+  env.CGO_ENABLED = "1";
+
+  postInstall = ''
+    mv $out/bin/enpasscli $out/bin/enpass-cli
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Command line client for Enpass password manager";
+    mainProgram = "enpass-cli";
+    homepage = "https://github.com/HazCod/enpass-cli";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ deej-io ];
+    platforms = lib.platforms.unix;
+  };
+}