diff --git a/.gitignore b/.gitignore
index 5747c89..4208d1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ libXi-1.4.0.tar.bz2
 /libXi-1.4.3.tar.bz2
 /libXi-1.4.99.1.tar.bz2
 /libXi-1.5.0.tar.bz2
+/libXi-20111221.tar.bz2
+/libXi-20111222.tar.bz2
diff --git a/commitid b/commitid
index 6621481..6ebb904 100644
--- a/commitid
+++ b/commitid
@@ -1 +1 @@
-2ce629c30745fc4027d2a95745bf21e8d8c7b893
+ae0187c8708d2378373889827117911086581fdd
diff --git a/libXi.spec b/libXi.spec
index 6b3b8d4..05cf9df 100644
--- a/libXi.spec
+++ b/libXi.spec
@@ -1,22 +1,26 @@
-%define tarball libXi
-#define gitdate 20090825
+%global tarball libXi
+%global gitdate 20111222
+%global gitversion ae0187c87
 
 Summary: X.Org X11 libXi runtime library
 Name: libXi
-Version: 1.5.0
-Release: 1%{?dist}
+Version: 1.5.99.2
+Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
 
-Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
-#Source0:    %{tarball}-%{gitdate}.tar.bz2
+%if 0%{?gitdate}
+Source0:    %{tarball}-%{gitdate}.tar.bz2
 Source1:    make-git-snapshot.sh
+%else
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+%endif
 
 BuildRequires: autoconf automake libtool
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: pkgconfig(inputproto) >= 2.0.99.1
+BuildRequires: pkgconfig(inputproto) >= 2.1.99.3
 BuildRequires: libX11-devel >= 1.2.99
 BuildRequires: libXext-devel
 BuildRequires: xmlto asciidoc >= 8.4.5
@@ -36,8 +40,7 @@ Requires: pkgconfig
 X.Org X11 libXi development package
 
 %prep
-%setup -q
-#setup -q -n %{tarball}-%{gitdate}
+%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
 
 # Disable static library creation by default.
 %define with_static 0
@@ -84,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Dec 22 2011 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.2-1.20111222.gitae0187c87
+- 1.5.99.2 from git
+
 * Wed Dec 21 2011 Peter Hutterer <peter.hutterer@redhat.com> 1.5.0-1
 - libXi 1.5.0
 
diff --git a/sources b/sources
index 1a42c47..d903f46 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eed79448dd24b31f3fedb1750fc777b3  libXi-1.5.0.tar.bz2
+7804e6c12a6e8802eed285c38e267c62  libXi-20111222.tar.bz2