diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e8577f8c175c0..d51c01f3e98da 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7067,6 +7067,11 @@
     githubId = 16175276;
     keys = [ { fingerprint = "E4CE B0F0 B2EC 09A3 9678  F294 CC7A 7E3C 6CF3 1343"; } ];
   };
+  EstebanMacanek = {
+    name = "Esteban Macanek";
+    github = "EstebanMacanek";
+    githubId = 75503218;
+  };
   ethancedwards8 = {
     email = "ethan@ethancedwards.com";
     github = "ethancedwards8";
diff --git a/pkgs/by-name/wa/wa-crypt-tools/package.nix b/pkgs/by-name/wa/wa-crypt-tools/package.nix
new file mode 100644
index 0000000000000..659d7114d352b
--- /dev/null
+++ b/pkgs/by-name/wa/wa-crypt-tools/package.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "wa-crypt-tools";
+  version = "0.1.0";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "ElDavoo";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-v5OrpYCajXNlfdTm569o8qw6REtPSUC9FLLwwDk+L/E=";
+  };
+
+  build-system = with python3Packages; [
+    setuptools
+    setuptools-scm
+  ];
+
+  pythonRelaxDeps = [ "protobuf" ];
+
+  dependencies = with python3Packages; [
+    javaobj-py3
+    pycryptodomex
+    protobuf
+  ];
+
+  nativeCheckInputs = [ python3Packages.pytest ];
+
+  checkPhase = ''
+    runHook preCheck
+    pytest
+    runHook postCheck
+  '';
+
+  meta = {
+    description = "Manage WhatsApp .crypt12, .crypt14 and .crypt15 files.";
+    homepage = "https://github.com/ElDavoo/wa-crypt-tools";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ EstebanMacanek ];
+    platforms = lib.platforms.all;
+  };
+}