diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index cd8b9ec17930..6bcd9116a8f2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8954,6 +8954,13 @@
     matrix = "@flandweber:envs.net";
     name = "Finn Landweber";
   };
+  flashonfire = {
+    email = "flashonfire@proton.me";
+    github = "flashonfire";
+    githubId = 26602207;
+    matrix = "@flashonfire:lithium.ovh";
+    name = "Guillaume Calderon";
+  };
   fleaz = {
     email = "mail@felixbreidenstein.de";
     matrix = "@fleaz:rainbownerds.de";
diff --git a/pkgs/by-name/ox/oxicloud/package.nix b/pkgs/by-name/ox/oxicloud/package.nix
new file mode 100644
index 000000000000..7c575920b2c0
--- /dev/null
+++ b/pkgs/by-name/ox/oxicloud/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  fetchFromGitHub,
+  makeBinaryWrapper,
+  openssl,
+  pkg-config,
+  rustPlatform,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "oxicloud";
+  version = "0.5.5";
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "DioCrafts";
+    repo = "OxiCloud";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Nn8qgLdiw7w4PZIMCiI+UHZGNW64fjWZ5mErTJifRZU=";
+  };
+
+  cargoHash = "sha256-4KfrKL2AKkTt3cOXdl9Xr2qed+qy8WSWuqYfN8WJ0bQ=";
+
+  nativeBuildInputs = [
+    makeBinaryWrapper
+    pkg-config
+  ];
+  buildInputs = [ openssl ];
+
+  cargoBuildFlags = [ "--bin=oxicloud" ];
+
+  postInstall = ''
+    mkdir -p $out/share/oxicloud
+    cp -r static-dist $out/share/oxicloud/static
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/oxicloud \
+      --set-default OXICLOUD_STATIC_PATH $out/share/oxicloud/static
+  '';
+
+  meta = {
+    description = "Ultra-fast, secure & lightweight self-hosted cloud storage";
+    homepage = "https://github.com/DioCrafts/OxiCloud";
+    changelog = "https://github.com/DioCrafts/OxiCloud/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    mainProgram = "oxicloud";
+    maintainers = with lib.maintainers; [ flashonfire ];
+    platforms = lib.platforms.linux;
+  };
+})