diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1e3cd0d8f81d..a4f49c2cfee6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4000,6 +4000,18 @@
     githubId = 141733;
     name = "Andrew Bruce";
   };
+  Cameo007 = {
+    name = "Pascal Dietrich";
+    email = "pascal.1.dietrich@hotmail.com";
+    matrix = "@cameo007:mintux.de";
+    github = "Cameo007";
+    githubId = 80521473;
+    keys = [
+      {
+        fingerprint = "2D62 24B9 1250 86AF E318 12A0 F1D1 5228 0511 FB91";
+      }
+    ];
+  };
   camerondugan = {
     email = "cameron.dugan@protonmail.com";
     github = "camerondugan";
diff --git a/pkgs/by-name/an/andcli/package.nix b/pkgs/by-name/an/andcli/package.nix
new file mode 100644
index 000000000000..eef0b52280f0
--- /dev/null
+++ b/pkgs/by-name/an/andcli/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "andcli";
+  version = "2.1.3";
+
+  subPackages = [ "cmd/andcli" ];
+
+  src = fetchFromGitHub {
+    owner = "tjblackheart";
+    repo = "andcli";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-MfhChaowSkCggeyubYdlcmU3+dd+yXlVrgdr85xjlI8=";
+  };
+
+  vendorHash = "sha256-C5XW3nxTUjcH6YaFYSxuKdtMF5SvrbOjErWIQXNwSJA=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/tjblackheart/andcli/v2/internal/buildinfo.Commit=${finalAttrs.src.tag}"
+    "-X github.com/tjblackheart/andcli/v2/internal/buildinfo.AppVersion=${finalAttrs.src.tag}"
+  ];
+
+  # As stated in #404465 the versionCheckHook does not work so it is not used here
+
+  meta = {
+    homepage = "https://github.com/tjblackheart/andcli";
+    description = "2FA TUI for your shell";
+    changelog = "https://github.com/tjblackheart/andcli/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ Cameo007 ];
+    mainProgram = "andcli";
+  };
+})