diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options
index 78273bc91f..cb446938e4 100644
--- a/distributions/LibreELEC/options
+++ b/distributions/LibreELEC/options
@@ -218,3 +218,10 @@
 
 # Settings package name - blank if not required
   DISTRO_PKG_SETTINGS="LibreELEC-settings"
+
+# IR remote protocols supported in default config
+  IR_REMOTE_PROTOCOLS="RC6 NEC"
+
+# IR remote keymaps supported in default config
+  IR_REMOTE_KEYMAPS="rc6_mce xbox_360 xbox_one"
+
diff --git a/packages/sysutils/v4l-utils/package.mk b/packages/sysutils/v4l-utils/package.mk
index 3b82e6de43..55127c0e45 100644
--- a/packages/sysutils/v4l-utils/package.mk
+++ b/packages/sysutils/v4l-utils/package.mk
@@ -62,7 +62,7 @@ create_multi_keymap() {
 }
 
 post_makeinstall_target() {
-  local default_multi_maps f keymap
+  local f keymap
 
   rm -rf $INSTALL/etc/rc_keymaps
     ln -sf /storage/.config/rc_keymaps $INSTALL/etc/rc_keymaps
@@ -86,16 +86,13 @@ post_makeinstall_target() {
   )
 
   # create multi keymap to support several remotes OOTB
+  if [ -n "$IR_REMOTE_PROTOCOLS" -a -n "$IR_REMOTE_KEYMAPS" ]; then
+    create_multi_keymap libreelec_multi "$IR_REMOTE_PROTOCOLS" $IR_REMOTE_KEYMAPS
 
-  default_multi_maps="rc6_mce xbox_360 zotac_ad10 hp_mce xbox_one cubox_i"
+    # use multi-keymap instead of default one
+    sed -i '/^\*\s*rc-rc6-mce\s*rc6_mce/d' $INSTALL/etc/rc_maps.cfg
 
-  create_multi_keymap libreelec_multi "RC6 NEC" $default_multi_maps
-  create_multi_keymap libreelec_multi_amlogic "RC6 NEC" $default_multi_maps \
-    odroid wetek_hub wetek_play_2 minix_neo
-
-  # use multi-keymap instead of default one
-  sed -i '/^\*\s*rc-rc6-mce\s*rc6_mce/d' $INSTALL/etc/rc_maps.cfg
-  cat << EOF >> $INSTALL/etc/rc_maps.cfg
+    cat << EOF >> $INSTALL/etc/rc_maps.cfg
 #
 # Custom LibreELEC configuration starts here
 #
@@ -103,6 +100,8 @@ post_makeinstall_target() {
 # *		rc-rc6-mce	rc6_mce
 *		rc-rc6-mce	libreelec_multi
 # multi-table for amlogic devices
-meson-ir	*		libreelec_multi_amlogic
+meson-ir	*		libreelec_multi
 EOF
+
+  fi
 }
diff --git a/projects/Amlogic/devices/Odroid_C2/options b/projects/Amlogic/devices/Odroid_C2/options
index 40d5dc9ab6..2e6e17a230 100644
--- a/projects/Amlogic/devices/Odroid_C2/options
+++ b/projects/Amlogic/devices/Odroid_C2/options
@@ -24,3 +24,7 @@
 
   # Amlogic IR remote support (yes / no)
     AMREMOTE_SUPPORT="no"
+
+  # add OOTB support for Odroid IR remote
+    IR_REMOTE_KEYMAPS="$IR_REMOTE_KEYMAPS odroid"
+
diff --git a/projects/Amlogic/devices/WeTek_Hub/options b/projects/Amlogic/devices/WeTek_Hub/options
index 9cc812b4d2..91bd6bfbbe 100644
--- a/projects/Amlogic/devices/WeTek_Hub/options
+++ b/projects/Amlogic/devices/WeTek_Hub/options
@@ -11,3 +11,6 @@
   # Space separated list is supported,
   # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
     FIRMWARE="$FIRMWARE brcmfmac_sdio-firmware-aml"
+
+  # add OOTB support for Wetek Hub IR remote
+    IR_REMOTE_KEYMAPS="$IR_REMOTE_KEYMAPS wetek_hub"
diff --git a/projects/Amlogic/devices/WeTek_Play_2/options b/projects/Amlogic/devices/WeTek_Play_2/options
index 61b44a5acc..e8d358439a 100644
--- a/projects/Amlogic/devices/WeTek_Play_2/options
+++ b/projects/Amlogic/devices/WeTek_Play_2/options
@@ -11,3 +11,7 @@
   # Space separated list is supported,
   # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
     FIRMWARE="$FIRMWARE brcmfmac_sdio-firmware-aml"
+
+  # add OOTB support for Wetek Play 2 IR remote
+    IR_REMOTE_KEYMAPS="$IR_REMOTE_KEYMAPS wetek_play_2"
+