diff --git a/0001-Disable-thumb-detection-it-s-too-aggressive-1246093.patch b/0001-Disable-thumb-detection-it-s-too-aggressive-1246093.patch
new file mode 100644
index 0000000..9894950
--- /dev/null
+++ b/0001-Disable-thumb-detection-it-s-too-aggressive-1246093.patch
@@ -0,0 +1,26 @@
+From a899d62c05d322581bd86e2d16be588e4655e1b6 Mon Sep 17 00:00:00 2001
+From: Fedora X Ninjas <x@fedoraproject.org>
+Date: Fri, 24 Jul 2015 08:35:08 +1000
+Subject: [PATCH] Disable thumb detection, it's too aggressive (#1246093)
+
+---
+ src/evdev-mt-touchpad.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
+index cbe8bed..360f930 100644
+--- a/src/evdev-mt-touchpad.c
++++ b/src/evdev-mt-touchpad.c
+@@ -1507,6 +1507,9 @@ tp_init_thumb(struct tp_dispatch *tp)
+ 	struct evdev_device *device = tp->device;
+ 	const struct input_absinfo *abs;
+ 
++        /* FEDORA: disable thumb detection, too aggressive */
++        return 0;
++
+ 	abs = libevdev_get_abs_info(device->evdev, ABS_MT_PRESSURE);
+ 	if (!abs)
+ 		return 0;
+-- 
+2.4.3
+
diff --git a/libinput.spec b/libinput.spec
index 8e600cf..5a0f773 100644
--- a/libinput.spec
+++ b/libinput.spec
@@ -5,7 +5,7 @@
 
 Name:           libinput
 Version:        0.20.0
-Release:        2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release:        3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 Summary:        Input device library
 
 License:        MIT
@@ -21,6 +21,8 @@ Source0:        http://www.freedesktop.org/software/libinput/libinput-%{version}
 Patch04:        0001-touchpad-only-edge-scroll-while-the-finger-is-in-the.patch
 Patch05:        0001-udev-don-t-install-the-litest-udev-rules.patch
 Patch06:        0001-evdev-restore-pointing-stick-const-accel-property-pa.patch
+# Fedora-specific, remove when thumb detection is fixed upstream
+Patch07:        0001-Disable-thumb-detection-it-s-too-aggressive-1246093.patch
 
 BuildRequires:  git
 BuildRequires:  autoconf automake libtool pkgconfig
@@ -98,6 +100,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
 
 
 %changelog
+* Fri Jul 24 2015 Peter Hutterer <peter.hutterer@redhat.com> 0.20.0-3
+- Disable thumb detection, too many false positives (#1246093)
+
 * Tue Jul 21 2015 Peter Hutterer <peter.hutterer@redhat.com> 0.20.0-2
 - Restore parsing for trackpoing const accel