diff --git a/pkgs/tools/system/ufiformat/default.nix b/pkgs/tools/system/ufiformat/default.nix
new file mode 100644
index 000000000000..5b778c5230e3
--- /dev/null
+++ b/pkgs/tools/system/ufiformat/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, e2fsprogs
+, fetchFromGitHub
+, lib
+}:
+
+stdenv.mkDerivation rec {
+  pname = "ufiformat";
+  version = "0.9.9";
+
+  buildInputs = [
+    e2fsprogs
+  ];
+
+  src = fetchFromGitHub {
+    owner = "tedigh";
+    repo = "ufiformat";
+    rev = "v${version}";
+    sha256 = "heFETZj9migz2s9kvmw0ZQ1ieNpU4V4Lwfp91ek2cS4=";
+  };
+
+  meta = with lib; {
+    homepage = "https://github.com/tedigh/ufiformat";
+    description = "Low-level disk formatting utility for USB floppy drives";
+    maintainers = [ maintainers.amarshall ];
+    platforms = platforms.linux;
+    license = licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f32d5264aebb..07f0fcadc679 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34943,6 +34943,8 @@ with pkgs;
 
   uacme = callPackage ../tools/admin/uacme { };
 
+  ufiformat = callPackage ../tools/system/ufiformat { };
+
   ums = callPackage ../servers/ums { };
 
   unityhub = callPackage ../development/tools/unityhub { };