diff --git a/pkgs/by-name/xk/xkbevd/package.nix b/pkgs/by-name/xk/xkbevd/package.nix
new file mode 100644
index 000000000000..fa479d469a22
--- /dev/null
+++ b/pkgs/by-name/xk/xkbevd/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoreconfHook,
+  bison,
+  pkg-config,
+  util-macros,
+  libx11,
+  libxkbfile,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xkbevd";
+  version = "1.1.6";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    group = "xorg";
+    owner = "app";
+    repo = "xkbevd";
+    tag = "xkbevd-${finalAttrs.version}";
+    hash = "sha256-n/detXvtRvysc5pjFc0Q27yLC2QsNUBo9AIXYkUG4PQ=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+    bison
+    pkg-config
+    util-macros
+  ];
+
+  buildInputs = [
+    util-macros # unused dependency but the build fails if pkg-config can't find it
+    libx11
+    libxkbfile
+  ];
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=xkbevd-(.*)" ]; };
+
+  meta = {
+    description = "XKB event daemon";
+    longDescription = ''
+      The xkbevd event daemon listens for specified XKB events and executes requested commands if
+      they occur. The configuration file consists of a list of event specification/action pairs
+      and/or variable definitions.
+      This command is very raw and is therefore only partially implemented; it is a rough prototype
+      for developers, not a general purpose tool for end users.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xkbevd";
+    license = lib.licenses.hpnd;
+    mainProgram = "xkbevd";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index e9ce1b14d01b..39db32b946fd 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -131,6 +131,7 @@
   xgamma,
   xgc,
   xhost,
+  xkbevd,
   xkbprint,
   xkbutils,
   xkeyboard-config,
@@ -214,6 +215,7 @@ self: with self; {
     xgamma
     xgc
     xhost
+    xkbevd
     xkbprint
     xkbutils
     xkill
@@ -2378,42 +2380,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xkbevd = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libxkbfile,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xkbevd";
-      version = "1.1.6";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xkbevd-1.1.6.tar.xz";
-        sha256 = "0gh73dsf4ic683k9zn2nj9bpff6dmv3gzcb3zx186mpq9kw03d6r";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        libxkbfile
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xtrap = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 7fa3735e264b..612bb169b5a9 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -463,6 +463,7 @@ print OUT <<EOF;
   xgamma,
   xgc,
   xhost,
+  xkbevd,
   xkbprint,
   xkbutils,
   xkeyboard-config,
@@ -546,6 +547,7 @@ self: with self; {
     xgamma
     xgc
     xhost
+    xkbevd
     xkbprint
     xkbutils
     xkill
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index f57dbd2a5ef5..7399e1e1c714 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -426,7 +426,6 @@ self: super:
   xfd = addMainProgram super.xfd { };
   xfs = addMainProgram super.xfs { };
   xinput = addMainProgram super.xinput { };
-  xkbevd = addMainProgram super.xkbevd { };
 
   xwd = addMainProgram super.xwd { };
 }
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 9f432d86215d..d418902b5602 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -4,7 +4,6 @@ mirror://xorg/individual/app/xfs-1.2.2.tar.xz
 mirror://xorg/individual/app/xinit-1.4.4.tar.xz
 mirror://xorg/individual/app/xinput-1.6.4.tar.xz
 mirror://xorg/individual/app/xkbcomp-1.5.0.tar.xz
-mirror://xorg/individual/app/xkbevd-1.1.6.tar.xz
 mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2
 mirror://xorg/individual/app/xwd-1.0.9.tar.xz
 mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz