diff --git a/Input-synaptics-add-min-max-quirk-for-Lenovo-S540.patch b/Input-synaptics-add-min-max-quirk-for-Lenovo-S540.patch
new file mode 100644
index 0000000..fbe5c57
--- /dev/null
+++ b/Input-synaptics-add-min-max-quirk-for-Lenovo-S540.patch
@@ -0,0 +1,39 @@
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon, 8 Jun 2015 10:17:32 -0700
+Subject: [PATCH] Input: synaptics - add min/max quirk for Lenovo S540
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1223051#c2
+
+Cc: stable@vger.kernel.org
+Tested-by: tommy.gagnes@gmail.com
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+---
+ drivers/input/mouse/synaptics.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
+index 3b06c8a360b6..907ac9bdd763 100644
+--- a/drivers/input/mouse/synaptics.c
++++ b/drivers/input/mouse/synaptics.c
+@@ -148,6 +148,11 @@ static const struct min_max_quirk min_max_pnpid_table[] = {
+ 		1024, 5112, 2024, 4832
+ 	},
+ 	{
++		(const char * const []){"LEN2000", NULL},
++		{ANY_BOARD_ID, ANY_BOARD_ID},
++		1024, 5113, 2021, 4832
++	},
++	{
+ 		(const char * const []){"LEN2001", NULL},
+ 		{ANY_BOARD_ID, ANY_BOARD_ID},
+ 		1024, 5022, 2508, 4832
+@@ -188,7 +193,7 @@ static const char * const topbuttonpad_pnp_ids[] = {
+ 	"LEN0045",
+ 	"LEN0047",
+ 	"LEN0049",
+-	"LEN2000",
++	"LEN2000", /* S540 */
+ 	"LEN2001", /* Edge E431 */
+ 	"LEN2002", /* Edge E531 */
+ 	"LEN2003",
diff --git a/kernel.spec b/kernel.spec
index 7d74a69..29b0480 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -684,6 +684,9 @@ Patch26222: powerpc-powernv-Restore-non-volatile-CRs-after-nap.patch
 #rhbz 1226621
 Patch26223: block-discard-bdi_unregister-in-favour-of-bdi_destro.patch
 
+#rhbz 1223051
+Patch26230: Input-synaptics-add-min-max-quirk-for-Lenovo-S540.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1471,6 +1474,9 @@ ApplyPatch powerpc-powernv-Restore-non-volatile-CRs-after-nap.patch
 #rhbz 1226621
 ApplyPatch block-discard-bdi_unregister-in-favour-of-bdi_destro.patch
 
+#rhbz 1223051
+ApplyPatch Input-synaptics-add-min-max-quirk-for-Lenovo-S540.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2330,6 +2336,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Tue Jun 09 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix touchpad for Thinkpad S540 (rhbz 1223051)
+
 * Mon Jun 08 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.5-200
 - Linux v4.0.5