diff --git a/.gitignore b/.gitignore
index dee8f5e..3131504 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /xf86-input-libinput-0.1.2.tar.gz
+/xf86-input-libinput-0.2.0.tar.bz2
diff --git a/90-libinput.conf b/90-libinput.conf
index 0f459d9..1af2577 100644
--- a/90-libinput.conf
+++ b/90-libinput.conf
@@ -1,5 +1,29 @@
+# Match on all types of devices but tablet devices and joysticks
+
 Section "InputClass"
-	Identifier "libinput"
-	Driver "libinput"
-	MatchDevicePath "/dev/input/event*"
+        Identifier "libinput pointer catchall"
+        MatchIsPointer "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "libinput"
+EndSection
+
+Section "InputClass"
+        Identifier "libinput keyboard catchall"
+        MatchIsKeyboard "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "libinput"
+EndSection
+
+Section "InputClass"
+        Identifier "libinput touchpad catchall"
+        MatchIsTouchpad "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "libinput"
+EndSection
+
+Section "InputClass"
+        Identifier "libinput touchscreen catchall"
+        MatchIsTouchscreen "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "libinput"
 EndSection
diff --git a/sources b/sources
index a0c5e0e..c769667 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c5ec32891a30e23fa06d0f4220beb726  xf86-input-libinput-0.1.2.tar.gz
+3c0d849d8b391a0997004f3b19352e5f  xf86-input-libinput-0.2.0.tar.bz2
diff --git a/xorg-x11-drv-libinput.spec b/xorg-x11-drv-libinput.spec
index 67e22a7..9359a48 100644
--- a/xorg-x11-drv-libinput.spec
+++ b/xorg-x11-drv-libinput.spec
@@ -4,12 +4,12 @@
 
 Summary:    Xorg X11 libinput input driver
 Name:       xorg-x11-drv-libinput
-Version:    0.1.2
-Release:    3%{?dist}
-URL:        http://www.github.com/whot/xf86-input-libinput/
+Version:    0.2.0
+Release:    1%{?dist}
+URL:        http://ww.x.org
 License:    MIT
 
-Source0:    https://github.com/whot/xf86-input-libinput/archive/%{tarball}-%{version}.tar.gz
+Source0:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:    90-libinput.conf
 
 ExcludeArch: s390 s390x
@@ -28,8 +28,7 @@ A generic input driver for the X.Org X11 X server based on libinput,
 supporting all devices.
 
 %prep
-#               sigh, github....
-%setup -q -n %{tarball}-%{tarball}-%{version}
+%setup -q -n %{tarball}-%{version}
 
 %build
 autoreconf --force -v --install || exit 1
@@ -50,8 +49,14 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/90-libi
 %doc COPYING
 %{driverdir}/libinput_drv.so
 %{_datadir}/X11/xorg.conf.d/90-libinput.conf
+%{_mandir}/man4/libinput.4*
 
 %changelog
+* Mon Nov 24 2014 Peter Hutterer <peter.hutterer@redhat.com> 0.2.0-1
+- Only match on specific device types, don't match on joysticks or tablets
+- libinput 0.2.0
+- switch to new fdo host
+
 * Fri Sep 12 2014 Peter Hutterer <peter.hutterer@redhat.com> - 0.1.2-3
 - Rebuild for libinput soname bump