diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a5c7112effbe..9515b0009667 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4232,6 +4232,15 @@
     githubId = 156239;
     name = "D Anzorge";
   };
+  defelo = {
+    name = "Defelo";
+    matrix = "@defelo:matrix.defelo.de";
+    github = "Defelo";
+    githubId = 41747605;
+    keys = [{
+      fingerprint = "6130 3BBA D7D1 BF74 EFA4  4E3B E7FE 2087 E438 0E64";
+    }];
+  };
   deifactor = {
     name = "Ash Zahlen";
     email = "ext0l@riseup.net";
diff --git a/pkgs/by-name/te/termshot/package.nix b/pkgs/by-name/te/termshot/package.nix
new file mode 100644
index 000000000000..b44f6ec906f3
--- /dev/null
+++ b/pkgs/by-name/te/termshot/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+}:
+buildGoModule rec {
+  pname = "termshot";
+  version = "0.2.7";
+
+  src = fetchFromGitHub {
+    owner = "homeport";
+    repo = "termshot";
+    rev = "v${version}";
+    hash = "sha256-Sxp6abYq0MrqtqDdpffSBdZB3/EyIMF9Ixsc7IgW5hI=";
+  };
+
+  vendorHash = "sha256-jzDbA1iN+1dbTVgKw228TuCV3eeAVmHFDiHd2qF/80E=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/homeport/termshot/internal/cmd.version=${version}"
+  ];
+
+  meta = {
+    description = "Creates screenshots based on terminal command output";
+    homepage = "https://github.com/homeport/termshot";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [defelo];
+    mainProgram = "termshot";
+  };
+}