diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 441b9b322435..cdf210160d3c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3429,6 +3429,12 @@
     githubId = 977929;
     name = "Cody Allen";
   };
+  Celibistrial = {
+    email = "ryan80222@gmail.com";
+    github = "Celibistrial";
+    githubId = 82810795;
+    name = "Gaurav Choudhury";
+  };
   centromere = {
     email = "nix@centromere.net";
     github = "centromere";
diff --git a/pkgs/by-name/nb/nbfc-linux/package.nix b/pkgs/by-name/nb/nbfc-linux/package.nix
new file mode 100644
index 000000000000..4e4e5bd4b374
--- /dev/null
+++ b/pkgs/by-name/nb/nbfc-linux/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "nbfc-linux";
+  version = "0.1.15";
+
+  src = fetchFromGitHub {
+    owner = "nbfc-linux";
+    repo = "nbfc-linux";
+    rev = "${finalAttrs.version}";
+    hash = "sha256-+xYr2uIxfMaMAaHGvvA+0WPZjwj3wVAc34e1DWsJLqE=";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+  configureFlags = [
+    "--prefix=${placeholder "out"}"
+    "--sysconfdir=${placeholder "out"}/etc"
+    "--bindir=${placeholder "out"}/bin"
+  ];
+
+  meta = {
+    description = "C port of Stefan Hirschmann's NoteBook FanControl";
+    longDescription = ''
+      nbfc-linux provides fan control service for notebooks
+    '';
+    homepage = "https://github.com/nbfc-linux/nbfc-linux";
+    license = lib.licenses.gpl3;
+    maintainers = [lib.maintainers.Celibistrial];
+    mainProgram = "nbfc";
+    platforms = lib.platforms.linux;
+  };
+})