diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5f29911332aa..98ac2f8dfac0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7592,6 +7592,16 @@
     githubId = 3159451;
     name = "Nicolas Schneider";
   };
+  nkje = {
+    name = "Niels Kristian Lyshøj Jensen";
+    email = "n@nk.je";
+    github = "NKJe";
+    githubId = 1102306;
+    keys = [{
+      longkeyid = "nistp256/0xDE3BADFECD31A89D";
+      fingerprint = "B956 C6A4 22AF 86A0 8F77  A8CA DE3B ADFE CD31 A89D";
+    }];
+  };
   nkpvk = {
     email = "niko.pavlinek@gmail.com";
     github = "nkpvk";
diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix
new file mode 100644
index 000000000000..1a01ffe954b6
--- /dev/null
+++ b/pkgs/servers/headscale/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "headscale";
+  version = "0.2.2";
+
+  src = fetchFromGitHub {
+    owner = "juanfont";
+    repo = "headscale";
+    rev = "v${version}";
+    sha256 = "0iij4hdbdplai5c8kvcwiw11idrk04xbpwb3njdhqcg6pdyx3216";
+  };
+
+  vendorSha256 = "sha256-8MCSN8wn2Y9ejHAIEwTdIXGITaa+FqX7WUMJEr0RcIk=";
+
+  # Ldflags are same as build target in the project's Makefile
+  # https://github.com/juanfont/headscale/blob/main/Makefile
+  ldflags = [ "-s" "-w" "-X main.version=v${version}" ];
+
+  meta = with lib; {
+    description = "An implementation of the Tailscale coordination server";
+    homepage = "https://github.com/juanfont/headscale";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ nkje ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 70356587f03b..6d6b95e8f4a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5759,6 +5759,8 @@ in
 
   heimdall-gui = heimdall.override { enableGUI = true; };
 
+  headscale = callPackage ../servers/headscale { };
+
   heisenbridge = callPackage ../servers/heisenbridge { };
 
   helio-workstation = callPackage ../applications/audio/helio-workstation { };