diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a0285a5e6e33..9dad34342d3b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10025,6 +10025,12 @@
     githubId = 27386;
     name = "Milan Svoboda";
   };
+  tfc = {
+    email = "jacek@galowicz.de";
+    github = "tfc";
+    githubId = 29044;
+    name = "Jacek Galowicz";
+  };
   tg-x = {
     email = "*@tg-x.net";
     github = "tg-x";
diff --git a/pkgs/applications/video/ustreamer/default.nix b/pkgs/applications/video/ustreamer/default.nix
new file mode 100644
index 000000000000..933747f39897
--- /dev/null
+++ b/pkgs/applications/video/ustreamer/default.nix
@@ -0,0 +1,37 @@
+{ lib, stdenv, fetchFromGitHub, libbsd, libevent, libjpeg }:
+
+stdenv.mkDerivation rec {
+  pname = "ustreamer";
+  version = "3.27";
+
+  src = fetchFromGitHub {
+    owner = "pikvm";
+    repo = "ustreamer";
+    rev = "v${version}";
+    sha256 = "1max2171abdpix0wq7mdkji5lvkfzisj166qfgmqkkwc2nh721iw";
+  };
+
+  buildInputs = [ libbsd libevent libjpeg ];
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ustreamer $out/bin/
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/pikvm/ustreamer";
+    description = "Lightweight and fast MJPG-HTTP streamer";
+    longDescription = ''
+      µStreamer is a lightweight and very quick server to stream MJPG video from
+      any V4L2 device to the net. All new browsers have native support of this
+      video format, as well as most video players such as mplayer, VLC etc.
+      µStreamer is a part of the Pi-KVM project designed to stream VGA and HDMI
+      screencast hardware data with the highest resolution and FPS possible.
+    '';
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ tfc ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4be52754f11b..14a509016497 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9369,6 +9369,8 @@ in
 
   usbmuxd = callPackage ../tools/misc/usbmuxd {};
 
+  ustreamer = callPackage ../applications/video/ustreamer { };
+
   usync = callPackage ../applications/misc/usync { };
 
   uwc = callPackage ../tools/text/uwc { };