diff --git a/0001-synaptics-Add-min-max-quirk-for-the-ThinkPad-W540.patch b/0001-synaptics-Add-min-max-quirk-for-the-ThinkPad-W540.patch
new file mode 100644
index 000000000..9ccc271fc
--- /dev/null
+++ b/0001-synaptics-Add-min-max-quirk-for-the-ThinkPad-W540.patch
@@ -0,0 +1,35 @@
+From 8351510e7a3c1b35adf046d8c473be2f5ad617c7 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 14 May 2014 12:40:08 +0200
+Subject: [PATCH] synaptics: Add min/max quirk for the ThinkPad W540
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1096436
+
+Tested-and-reported-by: ajayr@bigfoot.com
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/input/mouse/synaptics.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
+index d68d33f..d4c05b1 100644
+--- a/drivers/input/mouse/synaptics.c
++++ b/drivers/input/mouse/synaptics.c
+@@ -1614,6 +1614,14 @@ static const struct dmi_system_id min_max_dmi_table[] __initconst = {
+ 		.driver_data = (int []){1024, 5112, 2024, 4832},
+ 	},
+ 	{
++		/* Lenovo ThinkPad W540 */
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
++			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad W540"),
++		},
++		.driver_data = (int []){1024, 5112, 2024, 4832},
++	},
++	{
+ 		/* Lenovo Yoga S1 */
+ 		.matches = {
+ 			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+-- 
+1.9.0
+
diff --git a/kernel.spec b/kernel.spec
index 097f8d5b3..6777827df 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -778,6 +778,9 @@ Patch25087: jme-fix-dma-unmap-error.patch
 # CVE-2014-3144 CVE-2014-3145 rhbz 1096775, 1096784
 Patch25090: filter-prevent-nla-extensions-to-peek-beyond-the-end.patch
 
+#rhbz 1096436
+Patch25091: 0001-synaptics-Add-min-max-quirk-for-the-ThinkPad-W540.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1499,6 +1502,9 @@ ApplyPatch jme-fix-dma-unmap-error.patch
 # CVE-2014-3144 CVE-2014-3145 rhbz 1096775, 1096784
 ApplyPatch filter-prevent-nla-extensions-to-peek-beyond-the-end.patch
 
+#rhbz 1096436
+ApplyPatch 0001-synaptics-Add-min-max-quirk-for-the-ThinkPad-W540.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2311,6 +2317,9 @@ fi
 # and build.
 
 %changelog
+* Wed May 14 2014 Hans de Goede <hdegoede@redhat.com>
+- Add synaptics min/max quirk patch for the ThinkPad W540 (rhbz 1096436)
+
 * Tue May 13 2014 Justin M. Forbes <jforbes@fedoraproject.org> - 3.14.4-100
 - Linux v3.14.4