diff --git a/.gitignore b/.gitignore
index cde5ce9..be5ecdb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ xf86-input-synaptics-20100823.tar.bz2
 /xf86-input-synaptics-1.8.2.tar.bz2
 /xf86-input-synaptics-1.8.3.tar.bz2
 /xf86-input-synaptics-1.8.99.1.tar.bz2
+/xf86-input-synaptics-20160929.tar.bz2
diff --git a/commitid b/commitid
index 8d3b167..5ebcf98 100644
--- a/commitid
+++ b/commitid
@@ -1 +1 @@
-fd709900445e3cb9f31ce7e780bfa98ecb6dab9b
+486322116d70365c2e2a1d9f45830057fa03153e
diff --git a/sources b/sources
index 338e6f6..e8adce1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb7bf60fa4a694e2d0d91a4f89241502  xf86-input-synaptics-1.8.99.1.tar.bz2
+d1446590559ac37c3accc4e64af0a0fb  xf86-input-synaptics-20160929.tar.bz2
diff --git a/xorg-x11-drv-synaptics.spec b/xorg-x11-drv-synaptics.spec
index fee52b0..b677183 100644
--- a/xorg-x11-drv-synaptics.spec
+++ b/xorg-x11-drv-synaptics.spec
@@ -2,13 +2,13 @@
 %global moduledir %(pkg-config xorg-server --variable=moduledir )
 %global driverdir %{moduledir}/input
 
-#global gitdate 20140318
-%global gitversion fd7099004
+%global gitdate 20160929
+%global gitversion 48632211
 
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
 Version:        1.8.99.1
-Release:        1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release:        2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -88,8 +88,10 @@ if [ -z "$GIT_COMMITTER_NAME" ]; then
     git config user.email "x@fedoraproject.org"
     git config user.name "Fedora X Ninjas"
 fi
+%if !0%{?gitdate}
 git add .
 git commit -a -q -m "%{version} baseline."
+%endif
 
 # Apply all the patches.
 git am -p1 %{patches} < /dev/null
@@ -106,6 +108,12 @@ make %{?_smp_mflags}
 # should be fixed in upstream Makefile.am or whatever.
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
+# Remove upstream synaptics.conf as we've several special fixes in ours
+# Note upstream synaptics.conf has a priority of 70, we keep our
+# synaptics.conf at priority 50 for now, until we find a way to
+# auto-remove synaptics from systems which are upgraded from an older Fedora
+rm $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/70-synaptics.conf
+
 install -d $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
 install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/50-synaptics.conf
 
@@ -119,7 +127,8 @@ udevadm control --reload-rules || :
 udevadm control --reload-rules || :
 
 %files
-%doc COPYING
+%doc README
+%license COPYING
 %{_datadir}/X11/xorg.conf.d/50-synaptics.conf
 %{driverdir}/synaptics_drv.so
 %{_bindir}/synclient
@@ -127,7 +136,6 @@ udevadm control --reload-rules || :
 %{_mandir}/man4/synaptics.4*
 %{_mandir}/man1/synclient.1*
 %{_mandir}/man1/syndaemon.1*
-%doc COPYING README
 %{_udevrulesdir}/70-touchpad-quirks.rules
 
 %package devel
@@ -139,12 +147,16 @@ Requires:       pkgconfig
 Development files for the Synaptics TouchPad for X.Org.
 
 %files devel
-%doc COPYING
+%license COPYING
 %{_libdir}/pkgconfig/xorg-synaptics.pc
 %dir %{_includedir}/xorg
 %{_includedir}/xorg/synaptics-properties.h
 
 %changelog
+* Thu Sep 29 2016 Hans de Goede <hdegoede@redhat.com> 1.8.99.1-2.20160929git48632211
+- Update to latest git master for use with xserver-1.19
+- Rebuild against xserver-1.19
+
 * Fri Apr 29 2016 Peter Hutterer <peter.hutterer@redhat.com> 1.8.99.1-1
 - synaptics 1.9rc1