diff --git a/.gitignore b/.gitignore
index 0fc8755..8361cf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 libXv-1.0.5.tar.bz2
 /libXv-1.0.6.tar.bz2
 /libXv-1.0.7.tar.bz2
+/libXv-20130524.tar.bz2
diff --git a/commitid b/commitid
new file mode 100644
index 0000000..15d9d38
--- /dev/null
+++ b/commitid
@@ -0,0 +1 @@
+50fc4cb18069cb9450a02c13f80223ef23511409
diff --git a/libXv.spec b/libXv.spec
index 1947800..a7f7de2 100644
--- a/libXv.spec
+++ b/libXv.spec
@@ -1,12 +1,22 @@
+%global tarball libXv
+%global gitdate 20130524
+%global gitversion 50fc4cb18
+
 Summary: X.Org X11 libXv runtime library
 Name:    libXv
 Version: 1.0.7
-Release: 4%{?dist}
+Release: 5%{?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 libXv development package
 
 %prep
-%setup -q
+%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
 
 %build
 autoreconf -v --install --force
@@ -47,7 +57,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog
+%doc AUTHORS COPYING
 %{_libdir}/libXv.so.1
 %{_libdir}/libXv.so.1.0.0
 
@@ -61,6 +71,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri May 24 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.0.7-5.20130524git50fc4cb18
+- Update to git snapshot to fix the CVEs listed below:
+- CVE-2013-1989
+- CVE-2013-2066
+
 * Thu Mar 07 2013 Peter Hutterer <peter.hutterer@redhat.com> - 1.0.7-4
 - autoreconf for aarch64
 
diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh
new file mode 100755
index 0000000..c6c0f58
--- /dev/null
+++ b/make-git-snapshot.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+DIRNAME=libXv-$( date +%Y%m%d )
+
+rm -rf $DIRNAME
+git clone git://git.freedesktop.org/git/xorg/lib/libXv $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 255fbeb..1ad6b13 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5e1ac203ccd3ce3e89755ed1fbe75b0b  libXv-1.0.7.tar.bz2
+cc47adb8556dd35116e32e75d2678ae3  libXv-20130524.tar.bz2