diff --git a/modules/services/x11/xserver/default.nix b/modules/services/x11/xserver/default.nix
index 3904566d2f3..954c267b83f 100644
--- a/modules/services/x11/xserver/default.nix
+++ b/modules/services/x11/xserver/default.nix
@@ -499,6 +499,10 @@ mkIf cfg.enable {
       { source = "${configFile}";
         target = "X11/xorg.conf";
       }
+      # -xkbdir command line option does not seems to be passed to xkbcomp.
+      { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+        target = "X11/xkb";
+      }
     ];
 
     extraPackages = [