diff --git a/71-libinput-overrides-wacom.conf b/71-libinput-overrides-wacom.conf
new file mode 100644
index 0000000..69b1afa
--- /dev/null
+++ b/71-libinput-overrides-wacom.conf
@@ -0,0 +1,7 @@
+# Assign libinput back to touchpads on Wacom tablets
+Section "InputClass"
+	Identifier "libinput overrides wacom touchpads"
+	MatchDriver "wacom"
+	MatchIsTouchpad "true"
+	Driver "libinput"
+EndSection
diff --git a/xorg-x11-drv-libinput.spec b/xorg-x11-drv-libinput.spec
index 5b3faa9..eaf3071 100644
--- a/xorg-x11-drv-libinput.spec
+++ b/xorg-x11-drv-libinput.spec
@@ -8,7 +8,7 @@
 Summary:    Xorg X11 libinput input driver
 Name:       xorg-x11-drv-libinput
 Version:    0.22.0
-Release:    3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release:    4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 URL:        http://www.x.org
 License:    MIT
 
@@ -17,6 +17,7 @@ Source0:    %{tarball}-%{gitdate}.tar.xz
 %else
 Source0:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 %endif
+Source1:    71-libinput-overrides-wacom.conf
 
 Patch01:    0001-conf-match-against-tablets-too.patch
 
@@ -55,10 +56,13 @@ make %{?_smp_mflags}
 # should be fixed in upstream Makefile.am or whatever.
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
+cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/
+
 %files
 %doc COPYING
 %{driverdir}/libinput_drv.so
 %{_datadir}/X11/xorg.conf.d/40-libinput.conf
+%{_datadir}/X11/xorg.conf.d/71-libinput-overrides-wacom.conf
 %{_mandir}/man4/libinput.4*
 
 %package devel
@@ -74,6 +78,10 @@ Xorg X11 libinput input driver development files.
 %{_includedir}/xorg/libinput-properties.h
 
 %changelog
+* Fri Nov 25 2016 Peter Hutterer <peter.hutterer@redhat.com> 0.22.0-4
+- Override touchpads assigned the wacom driver with libinput again
+  (#1397477)
+
 * Fri Nov 18 2016 Peter Hutterer <peter.hutterer@redhat.com> 0.22.0-3
 - Provide xorg-x11-drv-synaptics. The actual content is now provided by
   xorg-x11-drv-synaptics-legacy (#1394836). For details, see