diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fe22dbee1134..35002ba83698 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -12221,6 +12221,12 @@
     githubId = 1903418;
     name = "Kovacsics Robert";
   };
+  kpcyrd = {
+    email = "git@rxv.cc";
+    github = "kpcyrd";
+    githubId = 7763184;
+    name = "kpcyrd";
+  };
   kquick = {
     email = "quick@sparq.org";
     github = "kquick";
diff --git a/pkgs/by-name/sp/spytrap-adb/package.nix b/pkgs/by-name/sp/spytrap-adb/package.nix
new file mode 100644
index 000000000000..4f619f13e486
--- /dev/null
+++ b/pkgs/by-name/sp/spytrap-adb/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  android-tools,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "spytrap-adb";
+  version = "0.3.3";
+
+  src = fetchFromGitHub {
+    owner = "spytrap-org";
+    repo = "spytrap-adb";
+    tag = "v${version}";
+    hash = "sha256-CL+MxSzHpOq2MXmsaa9sipQZ06Kkzy4r1eFjUrPSj1E=";
+  };
+
+  cargoHash = "sha256-Utg3ds0nGAUjBfuEjGfkohkmssKIZT1NiH9hiFnW4ps=";
+
+  env.SPYTRAP_ADB_BINARY = lib.getExe' android-tools "adb";
+
+  meta = {
+    description = "Test a phone for stalkerware using adb and usb debugging to scan for suspicious apps and configuration";
+    homepage = "https://github.com/spytrap-org/spytrap-adb";
+    changelog = "https://github.com/spytrap-org/spytrap-adb/releases/tag/v${version}";
+    mainProgram = "spytrap-adb";
+    license = with lib.licenses; [ gpl3Plus ];
+    maintainers = with lib.maintainers; [ kpcyrd ];
+    platforms = lib.platforms.all;
+  };
+}