diff --git a/Manual.org b/Manual.org
index 0a84bda..c5519df 100644
--- a/Manual.org
+++ b/Manual.org
@@ -1478,8 +1478,10 @@ b'\xde\xad\xbe\xef'
     - "/etc/X11/xorg.conf.d/"
 
 - name: command | write keyboard configuration to /etc/X11/xorg.conf.d/00-keyboard.conf
-  # Note: write-x11-keyboard-config is in the xlogin package
+  # NOTE: write-x11-keyboard-config is in the xlogin package
+  # Ubuntu's systemd is patched, so it does not create the file automatically
   command: write-x11-keyboard-config
+  creates: /etc/X11/xorg.conf.d/00-keyboard.conf
 
 - name: systemd-drop-in | add dependency to X-server for vdr.service
   template:
diff --git a/roles/yavdr-xorg/tasks/setup-xorg.yml b/roles/yavdr-xorg/tasks/setup-xorg.yml
index 9f46965..3a8f86a 100644
--- a/roles/yavdr-xorg/tasks/setup-xorg.yml
+++ b/roles/yavdr-xorg/tasks/setup-xorg.yml
@@ -11,8 +11,10 @@
     - "/etc/X11/xorg.conf.d/"
 
 - name: command | write keyboard configuration to /etc/X11/xorg.conf.d/00-keyboard.conf
-  # Note: write-x11-keyboard-config is in the xlogin package
+  # NOTE: write-x11-keyboard-config is in the xlogin package
+  # Ubuntu's systemd is patched, so it does not create the file automatically
   command: write-x11-keyboard-config
+  creates: /etc/X11/xorg.conf.d/00-keyboard.conf
 
 - name: systemd-drop-in | add dependency to X-server for vdr.service
   template: