diff --git a/flake.nix b/flake.nix
index ead5e66..4451b04 100644
--- a/flake.nix
+++ b/flake.nix
@@ -261,6 +261,7 @@
             dnspyre = pkgs.callPackage ./pkgs/dnspyre { };
             git-repo-go = pkgs.git-repo-go;
             hassbridge = pkgs.callPackage ./pkgs/hassbridge { };
+            mapshot = pkgs.mapshot;
             peakperf = pkgs.callPackage ./pkgs/peakperf { };
             tinyows = pkgs.callPackage ./pkgs/tinyows { };
             tsui = pkgs.callPackage ./pkgs/tsui { };
diff --git a/overlays/default.nix b/overlays/default.nix
index 7de9b12..ca47ebb 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -23,6 +23,8 @@ final: prev: {
   peakperf = prev.pkgs.callPackage ../pkgs/peakperf {
     enableCuda = false; # peakperf needs cuda-samples, which is not available in current CUDA. CUDA 11 is broken due to CVEs in freeimage
   };
+  mapshot = prev.pkgs.callPackage ../pkgs/mapshot { };
+
   factorio = prev.factorio.override { versionsJson = ./factorio.json; };
 
   python312 = prev.python312.override {
diff --git a/pkgs/mapshot/default.nix b/pkgs/mapshot/default.nix
new file mode 100644
index 0000000..91137a3
--- /dev/null
+++ b/pkgs/mapshot/default.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "mapshot";
+  version = "0.0.22";
+
+  src = fetchFromGitHub {
+    owner = "Palats";
+    repo = "mapshot";
+    rev = version;
+    hash = "sha256-cgNQU9T4xgJbUHI57XjP+UoCLfV+JCm0tvj8xLuI4Qs=";
+  };
+
+  vendorHash = "sha256-3bjEoE4angdBs2bVNINZrkeBl68NsWVRjlKTevLrroM=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  meta = {
+    description = "Factorio mod to export maps as zoomable html";
+    homepage = "https://github.com/Palats/mapshot";
+    changelog = "https://github.com/Palats/mapshot/blob/${src.rev}/changelog.txt";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ];
+    mainProgram = "mapshot";
+  };
+}