diff --git a/Makefile.am b/Makefile.am
index 86343eec39..9fc2faf211 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3887,6 +3887,7 @@ dist_udevrules_DATA += \
 
 nodist_udevrules_DATA += \
 	rules/50-udev-default.rules \
+	rules/60-input-id.rules \
 	rules/99-systemd.rules
 
 udevconfdir = $(sysconfdir)/udev
diff --git a/rules/50-udev-default.rules.in b/rules/50-udev-default.rules.in
index e556533020..898148c064 100644
--- a/rules/50-udev-default.rules.in
+++ b/rules/50-udev-default.rules.in
@@ -11,7 +11,6 @@ SUBSYSTEM=="rtc", ATTR{hctosys}=="1", SYMLINK+="rtc"
 SUBSYSTEM=="rtc", KERNEL=="rtc0", SYMLINK+="rtc", OPTIONS+="link_priority=-100"
 
 SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb"
-SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id"
 ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}"
 
 ACTION!="add", GOTO="default_end"
diff --git a/rules/60-evdev.rules b/rules/60-evdev.rules
index f5d5ba6a5f..e5e608acd3 100644
--- a/rules/60-evdev.rules
+++ b/rules/60-evdev.rules
@@ -8,7 +8,7 @@ IMPORT{builtin}="hwdb --subsystem=input --lookup-prefix=evdev:", \
   RUN{builtin}+="keyboard", GOTO="evdev_end"
 
 # AT keyboard matching by the machine's DMI data
-ENV{ID_INPUT_KEY}=="?*", DRIVERS=="atkbd", \
+DRIVERS=="atkbd", \
   IMPORT{builtin}="hwdb 'evdev:atkbd:$attr{[dmi/id]modalias}'", \
   RUN{builtin}+="keyboard", GOTO="evdev_end"
 
diff --git a/rules/60-input-id.rules b/rules/60-input-id.rules
new file mode 100644
index 0000000000..dee42199b6
--- /dev/null
+++ b/rules/60-input-id.rules
@@ -0,0 +1,7 @@
+# do not edit this file, it will be overwritten on update
+
+ACTION=="remove", GOTO="id_input_end"
+
+SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id"
+
+LABEL="id_input_end"