diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index efb8e85df618..b4ed4ecc2347 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18883,6 +18883,12 @@
     githubId = 41154684;
     name = "nokazn";
   };
+  nolith = {
+    github = "nolith";
+    githubId = 78752;
+    name = "Alessio Caiazza";
+    matrix = "@alessio:caiazza.info";
+  };
   nomaterials = {
     email = "nomaterials@gmail.com";
     github = "no-materials";
diff --git a/pkgs/by-name/un/undock/package.nix b/pkgs/by-name/un/undock/package.nix
new file mode 100644
index 000000000000..94fcb8d0dee4
--- /dev/null
+++ b/pkgs/by-name/un/undock/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+buildGoModule (finalAttrs: {
+  pname = "undock";
+  version = "0.10.0";
+
+  src = fetchFromGitHub {
+    owner = "crazy-max";
+    repo = "undock";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-p4x8SCYLErcu0ACbWUTjZVlzF+QEoC6xS7rpsOno/yw=";
+  };
+
+  vendorHash = null;
+
+  tags = [
+    "containers_image_openpgp"
+    "exclude_graphdriver_btrfs"
+    "exclude_graphdriver_devicemapper"
+  ];
+
+  env.CGO_ENABLED = 0;
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.version=${finalAttrs.version}"
+  ];
+
+  postInstall = ''
+    mv $out/bin/cmd $out/bin/undock
+  '';
+
+  meta = {
+    description = "Extract contents of a container image in a local folder";
+    homepage = "https://crazymax.dev/undock/";
+    license = lib.licenses.mit;
+    mainProgram = "undock";
+    maintainers = with lib.maintainers; [
+      nolith
+    ];
+  };
+})