diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh
new file mode 100755
index 0000000..64a5bec
--- /dev/null
+++ b/make-git-snapshot.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+proto=$1
+branch=$2
+
+if [ -z "$proto" ]; then
+    echo "Usage: $0 <proto name> [<branch>]"
+    exit 1
+fi
+
+dirname=$proto-$( date +%Y%m%d )
+
+rm -rf $dirname
+git clone git://git.freedesktop.org/git/xorg/proto/$proto $dirname
+cd $dirname
+if [ -z "$branch" ]; then
+    git log | head -1
+else
+    git checkout $branch
+fi
+sha=`git rev-list --max-count=1 --abbrev-commit HEAD`
+git repack -a -d
+cd ..
+
+# append sha to dirname
+mv $dirname $dirname-git$sha
+dirname=$dirname-git$sha
+tarball=$dirname.tar.bz2
+tar jcf $tarball $dirname
+rm -rf $dirname
+echo "$tarball is now available"
diff --git a/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec
index e1a71bc..12f1121 100644
--- a/xorg-x11-proto-devel.spec
+++ b/xorg-x11-proto-devel.spec
@@ -42,6 +42,8 @@ Source28: http://xorg.freedesktop.org/archive/individual/proto/xineramaproto-1.2
 Source29: http://xorg.freedesktop.org/archive/individual/proto/xproto-7.0.19.tar.bz2
 Source30: http://xorg.freedesktop.org/archive/individual/proto/xproxymanagementprotocol-1.0.3.tar.bz2
 
+Source40: make-git-snapshot.sh
+
 Patch1: 0001-Add-XF86XK_TouchpadOn-Off.patch
 
 BuildRequires: pkgconfig
@@ -270,6 +272,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Thu Feb 24 2011 Peter Hutterer <peter.hutterer@redhat.com>
+- Add make-git-snapshot script to snapshot protocol releases.
+
 * Thu Feb 24 2011 Peter Hutterer <peter.hutterer@redhat.com>
 - update source addresses: www.x.org is 301 Moved Permanently, moved to
   xorg.freedesktop.org.