diff --git a/debian/changelog b/debian/changelog
index c5b956824..41d0029bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -273,6 +273,8 @@ linux (4.11.11-1) UNRELEASED; urgency=medium
   * aufs: Update support patchset to aufs4.11.7+-20170703 (Closes: #867257)
   * [x86] ideapad-laptop: Add various IdeaPad models to no_hw_rfkill list
     (Closes: #866706)
+  * [x86] pinctrl: cherryview: Extend the Chromebook DMI quirk to Intel_Strago
+    systems (Closes: #862723)
 
   [ Uwe Kleine-König ]
   * [arm64] enable FB_SIMPLE
diff --git a/debian/patches/bugfix/x86/pinctrl-cherryview-extend-the-chromebook-dmi-quirk-t.patch b/debian/patches/bugfix/x86/pinctrl-cherryview-extend-the-chromebook-dmi-quirk-t.patch
new file mode 100644
index 000000000..8a94dcde2
--- /dev/null
+++ b/debian/patches/bugfix/x86/pinctrl-cherryview-extend-the-chromebook-dmi-quirk-t.patch
@@ -0,0 +1,59 @@
+From: Mika Westerberg <mika.westerberg@linux.intel.com>
+Date: Wed, 17 May 2017 13:25:14 +0300
+Subject: pinctrl: cherryview: Extend the Chromebook DMI quirk to Intel_Strago
+ systems
+Origin: https://git.kernel.org/linus/2a8209fa68236ad65363dba03db5dbced520268a
+Bug-Debian: https://bugs.debian.org/862723
+
+It turns out there are quite many Chromebooks out there that have the
+same keyboard issue than Acer Chromebook. All of them are based on
+Intel_Strago reference and report their DMI_PRODUCT_FAMILY as
+"Intel_Strago" (Samsung Chromebook 3 and Cyan Chromebooks are exceptions
+for which we add separate entries).
+
+Instead of adding each machine to the quirk table, we use
+DMI_PRODUCT_FAMILY of "Intel_Strago" that hopefully covers most of the
+machines out there currently.
+
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=194945
+Suggested: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
+Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+---
+ drivers/pinctrl/intel/pinctrl-cherryview.c | 21 +++++++++++++++++----
+ 1 file changed, 17 insertions(+), 4 deletions(-)
+
+--- a/drivers/pinctrl/intel/pinctrl-cherryview.c
++++ b/drivers/pinctrl/intel/pinctrl-cherryview.c
+@@ -1534,13 +1534,26 @@ static void chv_gpio_irq_handler(struct
+  * is not listed below.
+  */
+ static const struct dmi_system_id chv_no_valid_mask[] = {
++	/* See https://bugzilla.kernel.org/show_bug.cgi?id=194945 */
+ 	{
+-		/* See https://bugzilla.kernel.org/show_bug.cgi?id=194945 */
+-		.ident = "Acer Chromebook (CYAN)",
++		.ident = "Intel_Strago based Chromebooks (All models)",
+ 		.matches = {
+ 			DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"),
+-			DMI_MATCH(DMI_PRODUCT_NAME, "Edgar"),
+-			DMI_MATCH(DMI_BIOS_DATE, "05/21/2016"),
++			DMI_MATCH(DMI_PRODUCT_FAMILY, "Intel_Strago"),
++		},
++	},
++	{
++		.ident = "Acer Chromebook R11 (Cyan)",
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"),
++			DMI_MATCH(DMI_PRODUCT_NAME, "Cyan"),
++		},
++	},
++	{
++		.ident = "Samsung Chromebook 3 (Celes)",
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"),
++			DMI_MATCH(DMI_PRODUCT_NAME, "Celes"),
+ 		},
+ 	},
+ 	{}
diff --git a/debian/patches/series b/debian/patches/series
index f8034599a..e656e807f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -53,6 +53,7 @@ debian/amd64-don-t-warn-about-expected-w+x-pages-on-xen.patch
 
 # Arch bug fixes
 bugfix/arm/arm-dts-kirkwood-fix-sata-pinmux-ing-for-ts419.patch
+bugfix/x86/pinctrl-cherryview-extend-the-chromebook-dmi-quirk-t.patch
 bugfix/x86/platform-x86-ideapad-laptop-add-ideapad-310-15ikb-to.patch
 bugfix/x86/platform-x86-ideapad-laptop-add-ideapad-v310-15isk-t.patch
 bugfix/x86/platform-x86-ideapad-laptop-add-y520-15ikbn-to-no_hw.patch