diff --git a/packages/sysutils/eventlircd/evmap/osmc_rf.evmap b/packages/sysutils/eventlircd/evmap/osmc_rf.evmap
deleted file mode 100644
index 6f179cf33b..0000000000
--- a/packages/sysutils/eventlircd/evmap/osmc_rf.evmap
+++ /dev/null
@@ -1,13 +0,0 @@
-#KEY_HOME		= KEY_HOME
-#KEY_INFO		= KEY_INFO
-#KEY_UP			= KEY_UP
-#KEY_DOWN		= KEY_DOWN
-#KEY_LEFT		= KEY_LEFT
-#KEY_RIGHT		= KEY_RIGHT
-KEY_ENTER		= KEY_OK
-#KEY_BACK		= KEY_BACK
-#KEY_CONTEXT_MENU	= KEY_CONTEXT_MENU
-#KEY_PLAYPAUSE		= KEY_PLAYPAUSE
-#KEY_STOP		= KEY_STOP
-#KEY_REWIND		= KEY_REWIND
-#KEY_FASTFORWARD	= KEY_FASTFORWARD
diff --git a/packages/sysutils/eventlircd/evmap/osmc_rf2.evmap b/packages/sysutils/eventlircd/evmap/osmc_rf2.evmap
deleted file mode 100644
index 6881826b95..0000000000
--- a/packages/sysutils/eventlircd/evmap/osmc_rf2.evmap
+++ /dev/null
@@ -1,13 +0,0 @@
-#KEY_HOME		= KEY_HOME
-KEY_I			= KEY_INFO
-#KEY_UP			= KEY_UP
-#KEY_DOWN		= KEY_DOWN
-#KEY_LEFT		= KEY_LEFT
-#KEY_RIGHT		= KEY_RIGHT
-KEY_ENTER		= KEY_OK
-#KEY_BACK		= KEY_BACK
-KEY_C			= KEY_CONTEXT_MENU
-#KEY_PLAYPAUSE		= KEY_PLAYPAUSE
-#KEY_STOP		= KEY_STOP
-KEY_MINUS		= KEY_VOLUMEDOWN
-KEY_EQUAL		= KEY_VOLUMEUP
diff --git a/packages/sysutils/eventlircd/udev.d/98-eventlircd.rules b/packages/sysutils/eventlircd/udev.d/98-eventlircd.rules
index 66f96d25e9..49e3671432 100644
--- a/packages/sysutils/eventlircd/udev.d/98-eventlircd.rules
+++ b/packages/sysutils/eventlircd/udev.d/98-eventlircd.rules
@@ -186,14 +186,6 @@ ENV{ID_VENDOR_ID}=="0471", ENV{ID_MODEL_ID}=="20cc", \
   ENV{eventlircd_enable}="true", \
   ENV{eventlircd_evmap}="spinelplus.evmap"
 
-ENV{ID_VENDOR_ID}=="2252", ENV{ID_MODEL_ID}=="1037", \
-  ENV{eventlircd_enable}="true", \
-  ENV{eventlircd_evmap}="osmc_rf.evmap"
-
-ENV{ID_VENDOR_ID}=="2017", ENV{ID_MODEL_ID}=="1688", \
-  ENV{eventlircd_enable}="true", \
-  ENV{eventlircd_evmap}="osmc_rf2.evmap"
-
 # Enable wake-on-usb for the USB remotes.
   RUN+="wakeup_enable"
 
diff --git a/packages/sysutils/systemd/config/hwdb.d/99-osmcrf.hwdb b/packages/sysutils/systemd/config/hwdb.d/99-osmcrf.hwdb
new file mode 100644
index 0000000000..e457b47f22
--- /dev/null
+++ b/packages/sysutils/systemd/config/hwdb.d/99-osmcrf.hwdb
@@ -0,0 +1,17 @@
+evdev:input:b0003v2017p1689*
+ KEYBOARD_KEY_7002e=volumeup
+ KEYBOARD_KEY_7002d=volumedown
+ KEYBOARD_KEY_7000c=kpleftparen
+ KEYBOARD_KEY_70006=kprightparen
+
+evdev:input:b0003v2017p1688*
+ KEYBOARD_KEY_7004a=esc
+ KEYBOARD_KEY_c0060=kpleftparen
+ KEYBOARD_KEY_10084=kprightparen
+ KEYBOARD_KEY_7002e=volumeup
+ KEYBOARD_KEY_7002d=volumedown
+
+evdev:input:b0003v2252p1037*
+ KEYBOARD_KEY_7004a=esc
+ KEYBOARD_KEY_c0060=kpleftparen
+ KEYBOARD_KEY_10084=kprightparen
\ No newline at end of file