diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 67e7bc89adda..0dec47beb86a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3610,6 +3610,12 @@
     githubId = 1118859;
     name = "Scott Worley";
   };
+  chmouel = {
+    email = "chmouel@chmouel.com";
+    github = "chmouel";
+    githubId = 98980;
+    name = "Chmouel Boudjnah";
+  };
   choochootrain = {
     email = "hurshal@imap.cc";
     github = "choochootrain";
diff --git a/pkgs/by-name/go/gosmee/package.nix b/pkgs/by-name/go/gosmee/package.nix
new file mode 100644
index 000000000000..239bda90bd77
--- /dev/null
+++ b/pkgs/by-name/go/gosmee/package.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, installShellFiles
+}:
+
+buildGoModule rec {
+  pname = "gosmee";
+  version = "0.21.0";
+
+  src = fetchFromGitHub {
+    owner = "chmouel";
+    repo = "gosmee";
+    rev = "v${version}";
+    sha256 = "sha256-VNBz6roula/YlsYMM1kjQT3TLuQ86/MESzNNkEf/92M=";
+  };
+  vendorHash = null;
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postPatch = ''
+    printf ${version} > gosmee/templates/version
+  '';
+
+  postInstall = ''
+    installShellCompletion --cmd gosmee \
+      --bash <($out/bin/gosmee completion bash) \
+      --fish <($out/bin/gosmee completion fish) \
+      --zsh <($out/bin/gosmee completion zsh)
+  '';
+
+  meta = {
+    description = "Command line server and client for webhooks deliveries (and https://smee.io)";
+    homepage = "https://github.com/chmouel/gosmee";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ vdemeester chmouel ];
+  };
+}