diff --git a/.cvsignore b/.cvsignore
index edce4cb..1c85b10 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libXi-1.2.1.tar.bz2
+libXi-20090619.tar.bz2
diff --git a/libXi.spec b/libXi.spec
index b26e7e9..42872f7 100644
--- a/libXi.spec
+++ b/libXi.spec
@@ -1,19 +1,27 @@
+%define tarball libXi
+%define gitdate 20090619
+
 Summary: X.Org X11 libXi runtime library
 Name: libXi
-Version: 1.2.1
-Release: 1%{?dist}
+Version: 1.2.99
+Release: 1.%{gitdate}%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+#Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+Source0:    %{tarball}-%{gitdate}.tar.bz2
+Source1:    make-git-snapshot.sh
 
+BuildRequires: autoconf automake libtool
+BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: pkgconfig(inputproto) = 1.5.0
+BuildRequires: pkgconfig(inputproto) >= 1.9.99.12
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 BuildRequires: libXau-devel
+BuildRequires: xmlto asciidoc >= 8.4.5
 
 %description
 X.Org X11 libXi runtime library
@@ -31,18 +39,21 @@ Requires: pkgconfig
 X.Org X11 libXi development package
 
 %prep
-%setup -q
+#%setup -q
+%setup -q -n %{tarball}-%{gitdate}
 
 # Disable static library creation by default.
 %define with_static 0
 
 %build
-
+autoreconf -v --install || exit 1
 %configure \
 %if ! %{with_static}
 	--disable-static
 %endif
-make %{?_smp_mflags}
+
+# FIXME: parallel builds disabled. Man page hate.
+make #%{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -60,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING ChangeLog
+%doc COPYING
 %{_libdir}/libXi.so.6
 %{_libdir}/libXi.so.6.0.0
 
@@ -69,12 +80,17 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with_static}
 %{_libdir}/libXi.a
 %endif
+%{_includedir}/X11/extensions/XInput.h
+%{_includedir}/X11/extensions/XInput2.h
 %{_libdir}/libXi.so
 %{_libdir}/pkgconfig/xi.pc
 #%dir %{_mandir}/man3x
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Jun 19 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.2.99-1.20090619
+- Update to today's git master
+
 * Thu Feb 26 2009 Peter Hutterer <peter.hutterer@redhat.com> - 1.2.1-1
 - libXi 1.2.1 
 
diff --git a/sources b/sources
index cb5ac49..84c7366 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cfb36307e8e7ffafe40848dba24e0b11  libXi-1.2.1.tar.bz2
+e1d6d5d3b809254d698bfe04e845c09b  libXi-20090619.tar.bz2