diff --git a/packages/sysutils/systemd/hwdb.d/70-local-keyboard.hwdb b/packages/sysutils/systemd/hwdb.d/70-local-keyboard.hwdb
index c9e3613de2..6cd369b794 100644
--- a/packages/sysutils/systemd/hwdb.d/70-local-keyboard.hwdb
+++ b/packages/sysutils/systemd/hwdb.d/70-local-keyboard.hwdb
@@ -10,6 +10,10 @@ evdev:input:b0005v045Ep0041*
  KEYBOARD_KEY_7006f=x
  KEYBOARD_KEY_7006e=i
 
+# bt250 remote
+evdev:input:b0005v1D5ApC080e0000*
+ KEYBOARD_KEY_c0041=enter
+
 # buzztv bt-300/bt-400 smart remote
 evdev:input:b0005v0957p1001*
  KEYBOARD_KEY_c0041=enter
@@ -22,6 +26,10 @@ evdev:input:b0005v0957p1001*
  KEYBOARD_KEY_70045=volumeup
  KEYBOARD_KEY_70069=volumedown
 
+# foxtel remote
+evdev:input:b0005v06E7p8144*
+ KEYBOARD_KEY_c0041=enter
+
 # google tv remote
 evdev:name:*Chromecast Remote*:*
  KEYBOARD_KEY_c0041=enter
@@ -51,7 +59,11 @@ evdev:input:b0005v0217p0000e0110*
  KEYBOARD_KEY_c0041=enter
  KEYBOARD_KEY_c0040=c
 
-# osmcrf25 remotes
+# all osmc remotes
+evdev:input:b0003v2252p17*
+ KEYBOARD_KEY_7000c=kpleftparen
+ KEYBOARD_KEY_70006=kprightparen
+
 evdev:input:b0003v2252p1069*
  KEYBOARD_KEY_7002e=volumeup
  KEYBOARD_KEY_7002d=volumedown
@@ -86,6 +98,10 @@ evdev:input:b0003v2252p1037*
 evdev:input:b0005v005Dp0001*
  KEYBOARD_KEY_c0041=enter
 
+# UR02 remote
+evdev:input:b0005v0508p1980*
+ KEYBOARD_KEY_c0041=enter
+
 # wechip g20 remote
 evdev:input:b0003v4842p0001*
  KEYBOARD_KEY_c0041=enter
@@ -101,3 +117,7 @@ evdev:input:b0005v0416p0300*
 # zidoo v10
 evdev:input:b0005v2B54p1600*
  KEYBOARD_KEY_c0041=enter
+
+# ZTERCR21 remote
+evdev:input:b0005v0508p0110*
+ KEYBOARD_KEY_c0041=enter
diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk
index 6a1736fc7f..0ce6cd7628 100644
--- a/packages/sysutils/systemd/package.mk
+++ b/packages/sysutils/systemd/package.mk
@@ -155,6 +155,10 @@ post_makeinstall_target() {
   # adjust systemd-hwdb-update (we have read-only /etc).
   sed '/^ConditionNeedsUpdate=.*$/d' -i ${INSTALL}/usr/lib/systemd/system/systemd-hwdb-update.service
 
+  # remove systemd-creds
+  safe_remove ${INSTALL}/usr/bin/systemd-creds
+  safe_remove ${INSTALL}/usr/lib/tmpfiles.d/credstore.conf
+
   # remove nspawn
   safe_remove ${INSTALL}/usr/bin/systemd-nspawn
   safe_remove ${INSTALL}/usr/lib/systemd/system/systemd-nspawn@.service