diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 340a24cac087..2b5c9284a576 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1234,6 +1234,12 @@
     githubId = 37040543;
     name = "Wroclaw";
   };
+  amuckstot30 = {
+    email = "amuckstot30@tutanota.com";
+    github = "amuckstot30";
+    githubId = 157274630;
+    name = "amuckstot30";
+  };
   amyipdev = {
     email = "amy@amyip.net";
     github = "amyipdev";
diff --git a/pkgs/by-name/po/postmoogle/package.nix b/pkgs/by-name/po/postmoogle/package.nix
new file mode 100644
index 000000000000..5e6c60aba67a
--- /dev/null
+++ b/pkgs/by-name/po/postmoogle/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+buildGoModule rec {
+  pname = "postmoogle";
+  version = "0.9.21";
+
+  src = fetchFromGitHub {
+    owner = "etkecc";
+    repo = "postmoogle";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-/AuxrIvxoKb08uf4EOYXorl7vJ99KgEH9DZYLidDzI4=";
+  };
+
+  tags = [
+    "timetzdata"
+    "goolm"
+  ];
+
+  vendorHash = null;
+
+  postInstall = ''
+    mv $out/bin/cmd $out/bin/postmoogle
+  '';
+
+  meta = with lib; {
+    description = "Postmoogle is Matrix <-> Email bridge in a form of an SMTP server";
+    homepage = "https://github.com/etkecc/postmoogle";
+    changelog = "https://github.com/etkecc/postmoogle/releases/tag/v0.9.21";
+    license = licenses.agpl3Only;
+    maintainers = with maintainers; [ amuckstot30 ];
+    mainProgram = "postmoogle";
+  };
+}