diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-01-fix_RC6_map.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-01-fix_RC6_map.patch
deleted file mode 100644
index 1c891a30ea..0000000000
--- a/packages/sysutils/v4l-utils/patches/v4l-utils-01-fix_RC6_map.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Naur v4l-utils-1.6.0/utils/keytable/rc_keymaps/rc6_mce v4l-utils-1.6.0.patch/utils/keytable/rc_keymaps/rc6_mce
---- v4l-utils-1.6.0/utils/keytable/rc_keymaps/rc6_mce	2014-09-07 19:32:21.000000000 +0200
-+++ v4l-utils-1.6.0.patch/utils/keytable/rc_keymaps/rc6_mce	2014-11-14 02:51:17.947769083 +0100
-@@ -1,4 +1,4 @@
--# table rc6_mce, type: RC6_MCE
-+# table rc6_mce, type: RC6
- 0x800f0400 KEY_NUMERIC_0
- 0x800f0401 KEY_NUMERIC_1
- 0x800f0402 KEY_NUMERIC_2
diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-22-add-XBOX_One-remote.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-22-add-XBOX_One-remote.patch
index db4f1206d9..6528149545 100644
--- a/packages/sysutils/v4l-utils/patches/v4l-utils-22-add-XBOX_One-remote.patch
+++ b/packages/sysutils/v4l-utils/patches/v4l-utils-22-add-XBOX_One-remote.patch
@@ -2,8 +2,8 @@ diff -Naur v4l-utils-0.8.9/utils/keytable/rc_keymaps/rc6_mce v4l-utils-0.8.9.pat
 --- v4l-utils-0.8.9/utils/keytable/rc_keymaps/rc6_mce	2014-05-20 14:31:04.585559227 +0200
 +++ v4l-utils-0.8.9.patch/utils/keytable/rc_keymaps/rc6_mce	2014-05-20 17:47:04.341378915 +0200
 @@ -1,4 +1,4 @@
--# table rc6_mce, type: RC6
-+# table rc6_mce, type: RC6 NEC
+-# table rc6_mce, type: RC6_MCE
++# table rc6_mce, type: RC6_MCE NEC
  0x800f0400 KEY_NUMERIC_0
  0x800f0401 KEY_NUMERIC_1
  0x800f0402 KEY_NUMERIC_2
diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-99-upstream.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-99-upstream.patch
new file mode 100644
index 0000000000..c0f209fbf5
--- /dev/null
+++ b/packages/sysutils/v4l-utils/patches/v4l-utils-99-upstream.patch
@@ -0,0 +1,12 @@
+diff -Naur v4l-utils-1.6.0/utils/keytable/keytable.c v4l-utils-1.6.0.patch/utils/keytable/keytable.c
+--- v4l-utils-1.6.0/utils/keytable/keytable.c	2014-08-22 16:59:47.000000000 +0200
++++ v4l-utils-1.6.0.patch/utils/keytable/keytable.c	2014-11-15 21:57:15.200451780 +0100
+@@ -226,7 +226,7 @@
+ 							goto err_einval;
+ 						if (!strcasecmp(p,"rc5") || !strcasecmp(p,"rc-5"))
+ 							ch_proto |= RC_5;
+-						else if (!strcasecmp(p,"rc6") || !strcasecmp(p,"rc-6"))
++						else if (!strcasecmp(p,"rc6") || !strcasecmp(p,"rc-6") || !strcasecmp(p,"rc6-mce") || !strcasecmp(p,"rc6_mce"))
+ 							ch_proto |= RC_6;
+ 						else if (!strcasecmp(p,"nec"))
+ 							ch_proto |= NEC;