diff --git a/.gitignore b/.gitignore
index 4d68012..20300f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 libXtst-1.0.99.2.tar.bz2
 /libXtst-1.2.0.tar.bz2
 /libXtst-1.2.1.tar.bz2
+/libXtst-20130524.tar.bz2
diff --git a/commitid b/commitid
new file mode 100644
index 0000000..5888402
--- /dev/null
+++ b/commitid
@@ -0,0 +1 @@
+e7e04b7be3f018ad636aba3a36bfc1cd80b9906d
diff --git a/libXtst.spec b/libXtst.spec
index 53a6906..03eb319 100644
--- a/libXtst.spec
+++ b/libXtst.spec
@@ -1,12 +1,22 @@
+%global tarball libXtst
+%global gitdate 20130524
+%global gitversion e7e04b7be
+
 Summary: X.Org X11 libXtst runtime library
 Name: libXtst
 Version: 1.2.1
-Release: 5%{?dist}
+Release: 6%{?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
+%if 0%{?gitdate}
+Source0:    %{tarball}-%{gitdate}.tar.bz2
+Source1:    make-git-snapshot.sh
+Source2:    commitid
+%else
+Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
+%endif
 
 BuildRequires: xorg-x11-util-macros
 BuildRequires: autoconf automake libtool
@@ -29,7 +39,7 @@ Requires: libXi-devel%{?_isa}
 X.Org X11 libXtst development package
 
 %prep
-%setup -q
+%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
 
 %build
 autoreconf -v --install --force
@@ -55,7 +65,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING ChangeLog
+%doc COPYING
 %{_libdir}/libXtst.so.6
 %{_libdir}/libXtst.so.6.1.0
 
@@ -68,6 +78,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/XTest*.3*
 
 %changelog
+* Fri May 24 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.2.1-6.20130524gite7e04b7be
+- Update to git snapshot to fix CVEs listed below
+- CVE-2013-2063
+
 * Thu Mar 07 2013 Peter Hutterer <peter.hutterer@redhat.com> - 1.2.1-5
 - autoreconf for aarch64
 
diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh
new file mode 100755
index 0000000..0bcb05a
--- /dev/null
+++ b/make-git-snapshot.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+DIRNAME=libXtst-$( date +%Y%m%d )
+
+rm -rf $DIRNAME
+git clone git://git.freedesktop.org/git/xorg/lib/libXtst $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 c5dab62..3f87868 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e8abc5c00c666f551cf26aa53819d592  libXtst-1.2.1.tar.bz2
+33cad0a16e84643dfdbf7cb426110b22  libXtst-20130524.tar.bz2