diff --git a/.gitignore b/.gitignore
index 9572f00..7c4daf4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ libXt-1.0.7.tar.bz2
 /libXt-1.1.1.tar.bz2
 /libXt-1.1.2.tar.bz2
 /libXt-1.1.3.tar.bz2
+/libXt-20130524.tar.bz2
diff --git a/commitid b/commitid
new file mode 100644
index 0000000..ec43720
--- /dev/null
+++ b/commitid
@@ -0,0 +1 @@
+1f4802b745aa172d375cb79403cb1e013e6aa4c0
diff --git a/libXt.spec b/libXt.spec
index 3c6b4ba..8ad91e8 100644
--- a/libXt.spec
+++ b/libXt.spec
@@ -1,12 +1,22 @@
+%global tarball libXt
+%global gitdate 20130524
+%global gitversion 1f4802b74
+
 Summary: X.Org X11 libXt runtime library
 Name: libXt
 Version: 1.1.3
-Release: 3%{?dist}
+Release: 4%{?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
@@ -24,7 +34,7 @@ Requires: %{name} = %{version}-%{release}
 X.Org X11 libXt development package
 
 %prep
-%setup -q
+%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
 
 %build
 autoreconf -v --install --force
@@ -50,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING ChangeLog
+%doc COPYING
 %{_libdir}/libXt.so.6
 %{_libdir}/libXt.so.6.0.0
 %dir %{_datadir}/X11/app-defaults
@@ -96,6 +106,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri May 24 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.1.3-4.20130524git1f4802b74
+- Update to git snapshot to fix CVEs listed below:
+- CVE-2013-2002
+- CVE-2013-2005
+
 * Thu Mar 07 2013 Peter Hutterer <peter.hutterer@redhat.com> - 1.1.3-3
 - autoreconf for aarch64
 
diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh
new file mode 100755
index 0000000..71d7f95
--- /dev/null
+++ b/make-git-snapshot.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+DIRNAME=libXt-$( date +%Y%m%d )
+
+rm -rf $DIRNAME
+git clone git://git.freedesktop.org/git/xorg/lib/libXt $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 aca00d4..a0455aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a6f137ae100e74ebe3b71eb4a38c40b3  libXt-1.1.3.tar.bz2
+ecb9fd78a4264e21b8433b2356ab5032  libXt-20130524.tar.bz2