diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 723f7611268b..adb5af25a9a9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5841,6 +5841,12 @@
     githubId = 6872940;
     name = "Dennis Værum";
   };
+  dvcorreia = {
+    email = "dv_correia@hotmail.com";
+    name = "Diogo Correia";
+    github = "dvcorreia";
+    githubId = 20357938;
+  };
   dvn0 = {
     email = "git@dvn.me";
     github = "dvn0";
diff --git a/pkgs/by-name/wh/whoami/package.nix b/pkgs/by-name/wh/whoami/package.nix
new file mode 100644
index 000000000000..d47aaed3ed46
--- /dev/null
+++ b/pkgs/by-name/wh/whoami/package.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "whoami";
+  version = "1.10.3";
+
+  src = fetchFromGitHub {
+    owner = "traefik";
+    repo = "whoami";
+    rev = "v${version}";
+    hash = "sha256-wzxgmysqn4aWAZEaMjMwHdHLe4UZ4nwdNFJw5X7fuKQ=";
+  };
+
+  vendorHash = "sha256-qDfkYIAymkFUtbKka9OLoYjT+S9KhOra2UtOvhoz5Mw=";
+
+  ldflags = [ "-s" ];
+
+  CGO_ENABLED = 0;
+
+  doCheck = false;
+
+  meta = {
+    description = "Tiny Go server that prints os information and HTTP request to output";
+    mainProgram = "whoami";
+    homepage = "https://github.com/traefik/whoami";
+    changelog = "https://github.com/traefik/whoami/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dvcorreia ];
+  };
+}