diff --git a/.cvsignore b/.cvsignore
index c0ddcd3..52828ff 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xf86-input-wacom-0.10.4.tar.bz2
+xf86-input-wacom-20100219.tar.bz2
diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh
new file mode 100755
index 0000000..1cd618c
--- /dev/null
+++ b/make-git-snapshot.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+DIRNAME=xf86-input-wacom-$( date +%Y%m%d )
+
+rm -rf $DIRNAME
+git clone git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/xf86-input-wacom $DIRNAME
+cd $DIRNAME
+if [ -z "$1" ]; then
+    git log | head -1
+else
+    git checkout $1
+fi
+git log | head -1 | awk '{ print $2 }' > ../commitid
+git repack -a -d
+cd ..
+tar jcf $DIRNAME.tar.bz2 $DIRNAME
+rm -rf $DIRNAME
diff --git a/sources b/sources
index 165498f..3708453 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d6ded7769606ef1725067031445499f5  xf86-input-wacom-0.10.4.tar.bz2
+f4b5657d15f09b51fc50b7cc7cb17e69  xf86-input-wacom-20100219.tar.bz2
diff --git a/xorg-x11-drv-wacom.spec b/xorg-x11-drv-wacom.spec
index e95c8d6..81badad 100644
--- a/xorg-x11-drv-wacom.spec
+++ b/xorg-x11-drv-wacom.spec
@@ -2,16 +2,23 @@
 %global moduledir %(pkg-config xorg-server --variable=moduledir )
 %global driverdir %{moduledir}/input
 
+# Disable gitdate to build from a fixed release
+%global gitdate 20100219
+
 Summary:    Xorg X11 wacom input driver
 Name:       xorg-x11-drv-wacom
 Version:    0.10.4
-Release:    3%{?dist}
+Release:    4%{?gitdate:.%{gitdate}}%{?dist}
 URL:        http://www.x.org
 License:    GPLv2+
 Group:      User Interface/X Hardware Support
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-0.10.4.tar.bz2
+%if 0%{?gitdate}
+Source0: %{tarball}-%{gitdate}.tar.bz2
+%else
+Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{version}.tar.bz2
+%endif
 Source1: 10-wacom.conf
 
 ExcludeArch: s390 s390x
@@ -30,9 +37,13 @@ Obsoletes: linuxwacom <= 0.8.4.3
 X.Org X11 wacom input driver for Wacom tablets.
 
 %prep
-%setup -q -n %{tarball}-%{version}
+%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
 
 %build
+%if 0%{?gitdate}
+autoreconf -v --install || exit 1
+%endif
+
 %configure --disable-static
 make %{_smp_mflags}
 
@@ -54,7 +65,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog README GPL
+%doc AUTHORS README GPL
+%if !0%{?gitdate}
+# ChangeLog is autogenerated by make dist, we don't run it from git builds
+%doc ChangeLog
+%endif
 %{driverdir}/wacom_drv.so
 %{_mandir}/man4/wacom.4*
 %{_sysconfdir}/xorg.conf.d/10-wacom.conf
@@ -77,6 +92,10 @@ X.Org X11 wacom input driver development files.
 %{_includedir}/xorg/wacom-properties.h
 
 %changelog
+* Fri Feb 19 2010 Peter Hutterer <peter.hutterer@redhat.com> 0.10.4-4.20100219
+- Add stuff required to build from upstream git.
+- Update to today's git snapshot.
+
 * Wed Feb 17 2010 Peter Hutterer <peter.hutterer@redhat.com> 0.10.4-3
 - Add 10-wacom.conf, the fdi file doesn't work anymore.
 - Drop hal requires.