diff --git a/.cvsignore b/.cvsignore
index 8ed8362..0caa69d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -27,3 +27,5 @@ glproto-1.4.10.tar.bz2
 dri2proto-2.1.tar.bz2
 inputproto-1.9.99.14.tar.bz2
 randrproto-1.3.0.tar.bz2
+xextproto-7.0.99.1.tar.bz2
+fixesproto-c7c9beab9a41d835008e1070c0ed8470293fe6ba.tar.bz2
diff --git a/sources b/sources
index 2da2861..7ab00cf 100644
--- a/sources
+++ b/sources
@@ -3,7 +3,6 @@
 33ee591e0b1ca5ad7902934541db7d24  damageproto-1.1.0.tar.bz2
 d80acad88411e7944b9b085463d53302  dmxproto-2.2.2.tar.bz2
 2507b5d0f4b2848147fbddd155aa6cfe  evieext-1.0.2.tar.bz2
-8b298cc3424597f8138c7faf7763dce9  fixesproto-4.0.tar.bz2
 c946f166107b016a21cc7a02e1132724  fontsproto-2.0.2.tar.bz2
 6092cdb0a1225f95356ddbe6c2abaad5  kbproto-1.0.3.tar.bz2
 0ed4706564a34fc2aff724aa16d3ff00  recordproto-1.13.2.tar.bz2
@@ -12,7 +11,6 @@ b823b314e37eb19dae1f297951d2e933  resourceproto-1.0.2.tar.bz2
 5d551850e6f4acdf49a13f4eb3a5bbfa  scrnsaverproto-1.1.0.tar.bz2
 44292d74a9a3c94b1ecb9d77a0da83e8  videoproto-2.2.2.tar.bz2
 fde0b050901f024b19159cdacdcfbd20  xcmiscproto-1.1.2.tar.bz2
-64c19cbf368f053cfc689609589dacfe  xextproto-7.0.4.tar.bz2
 a318c1e86123832d7b0c95fc7d47ef35  xf86bigfontproto-1.1.2.tar.bz2
 42fdcebc66efac02ab4beec2b1b0ad6e  xf86dgaproto-2.0.3.tar.bz2
 01470d088da3a8a3deefa8e1f45d69cb  xf86driproto-2.0.4.tar.bz2
@@ -25,3 +23,5 @@ c9f8cebfba72bfab674bc0170551fb8d  glproto-1.4.10.tar.bz2
 5cb7987d29db068153bdc8f23c767c43  dri2proto-2.1.tar.bz2
 291ba427a40869cf9909b6c950bf6eab  inputproto-1.9.99.14.tar.bz2
 a49416013fff33c853efb32f1926551e  randrproto-1.3.0.tar.bz2
+8439d47c486b7dbd85e4071d6c8408ca  xextproto-7.0.99.1.tar.bz2
+7089b823b1a7cff05478e2330a85e541  fixesproto-c7c9beab9a41d835008e1070c0ed8470293fe6ba.tar.bz2
diff --git a/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec
index 1bdf7d2..fc8ca72 100644
--- a/xorg-x11-proto-devel.spec
+++ b/xorg-x11-proto-devel.spec
@@ -7,7 +7,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.4
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -20,7 +20,8 @@ Source2:  http://www.x.org/pub/individual/proto/damageproto-1.1.0.tar.bz2
 Source3:  http://www.x.org/pub/individual/proto/dmxproto-2.2.2.tar.bz2
 Source31: http://www.x.org/pub/individual/proto/dri2proto-2.1.tar.bz2
 Source4:  http://www.x.org/pub/individual/proto/evieext-1.0.2.tar.bz2
-Source5:  http://www.x.org/pub/individual/proto/fixesproto-4.0.tar.bz2
+#Source5:  http://www.x.org/pub/individual/proto/fixesproto-4.0.tar.bz2
+Source5: http://cgit.freedesktop.org/xorg/proto/fixesproto/snapshot/fixesproto-c7c9beab9a41d835008e1070c0ed8470293fe6ba.tar.bz2
 Source7:  http://www.x.org/pub/individual/proto/fontsproto-2.0.2.tar.bz2
 Source8:  http://www.x.org/pub/individual/proto/glproto-1.4.10.tar.bz2
 Source9:  http://www.x.org/pub/individual/proto/inputproto-1.9.99.14.tar.bz2
@@ -32,7 +33,7 @@ Source16: http://www.x.org/pub/individual/proto/resourceproto-1.0.2.tar.bz2
 Source17: http://www.x.org/pub/individual/proto/scrnsaverproto-1.1.0.tar.bz2
 Source19: http://www.x.org/pub/individual/proto/videoproto-2.2.2.tar.bz2
 Source20: http://www.x.org/pub/individual/proto/xcmiscproto-1.1.2.tar.bz2
-Source21: http://www.x.org/pub/individual/proto/xextproto-7.0.4.tar.bz2
+Source21: http://www.x.org/pub/individual/proto/xextproto-7.0.99.1.tar.bz2
 Source22: http://www.x.org/pub/individual/proto/xf86bigfontproto-1.1.2.tar.bz2
 Source23: http://www.x.org/pub/individual/proto/xf86dgaproto-2.0.3.tar.bz2
 Source24: http://www.x.org/pub/individual/proto/xf86driproto-2.0.4.tar.bz2
@@ -62,6 +63,7 @@ X.Org X11 Protocol headers
 # Proceed through each proto package directory, building them all
 for dir in $(ls -1) ; do
 	pushd $dir
+        [ -e configure ] || ./autogen.sh
 	# yes, this looks horrible, but it's to get the .pc files in datadir
 	%configure --libdir=%{_datadir}
 	make %{?_smp_mflags}
@@ -77,7 +79,7 @@ for dir in $(ls -1) ; do
 	install -m 444 COPYING-${dir%%-*} $OLDPWD
 	popd
 done
-for i in composite damage randr render ; do
+for i in composite damage fixes randr render ; do
     mv $RPM_BUILD_ROOT/usr/share/doc/${i}proto/${i}proto.txt .
 done
 
@@ -97,6 +99,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING-*
 %doc compositeproto.txt
 %doc damageproto.txt
+%doc fixesproto.txt
 %doc randrproto.txt
 %doc renderproto.txt
 %dir %{_includedir}/GL
@@ -138,54 +141,49 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/dri/xf86dri.h
 %{_includedir}/X11/dri/xf86dristr.h
 %dir %{_includedir}/X11/extensions
-%{_includedir}/X11/extensions/MITMisc.h
-%{_includedir}/X11/extensions/XEVI.h
-%{_includedir}/X11/extensions/XEVIstr.h
+%{_includedir}/X11/extensions/EVI.h
+%{_includedir}/X11/extensions/EVIproto.h
 %{_includedir}/X11/extensions/XI.h
-%{_includedir}/X11/extensions/XIproto.h
 %{_includedir}/X11/extensions/XI2.h
 %{_includedir}/X11/extensions/XI2proto.h
+%{_includedir}/X11/extensions/XIproto.h
 %{_includedir}/X11/extensions/XKB.h
 %{_includedir}/X11/extensions/XKBgeom.h
 %{_includedir}/X11/extensions/XKBproto.h
 %{_includedir}/X11/extensions/XKBsrv.h
 %{_includedir}/X11/extensions/XKBstr.h
-%{_includedir}/X11/extensions/XLbx.h
 %{_includedir}/X11/extensions/XResproto.h
-%{_includedir}/X11/extensions/XShm.h
-%{_includedir}/X11/extensions/XTest.h
-%{_includedir}/X11/extensions/Xag.h
-%{_includedir}/X11/extensions/Xagstr.h
-%{_includedir}/X11/extensions/Xcup.h
-%{_includedir}/X11/extensions/Xcupstr.h
-%{_includedir}/X11/extensions/Xdbe.h
-%{_includedir}/X11/extensions/Xdbeproto.h
-%{_includedir}/X11/extensions/Xext.h
 %{_includedir}/X11/extensions/Xeviestr.h
-%{_includedir}/X11/extensions/Xge.h
 %{_includedir}/X11/extensions/Xinerama.h
 %{_includedir}/X11/extensions/Xv.h
 %{_includedir}/X11/extensions/XvMC.h
 %{_includedir}/X11/extensions/XvMCproto.h
 %{_includedir}/X11/extensions/Xvproto.h
+%{_includedir}/X11/extensions/ag.h
+%{_includedir}/X11/extensions/agproto.h
 %{_includedir}/X11/extensions/bigreqstr.h
 %{_includedir}/X11/extensions/composite.h
 %{_includedir}/X11/extensions/compositeproto.h
+%{_includedir}/X11/extensions/cup.h
+%{_includedir}/X11/extensions/cupproto.h
 %{_includedir}/X11/extensions/damageproto.h
 %{_includedir}/X11/extensions/damagewire.h
+%{_includedir}/X11/extensions/dbe.h
+%{_includedir}/X11/extensions/dbeproto.h
 %{_includedir}/X11/extensions/dmxext.h
 %{_includedir}/X11/extensions/dmxproto.h
-%{_includedir}/X11/extensions/dpms.h
-%{_includedir}/X11/extensions/dpmsstr.h
+%{_includedir}/X11/extensions/dpmsconst.h
+%{_includedir}/X11/extensions/dpmsproto.h
 %{_includedir}/X11/extensions/dri2proto.h
 %{_includedir}/X11/extensions/dri2tokens.h
-%{_includedir}/X11/extensions/extutil.h
 %{_includedir}/X11/extensions/ge.h
 %{_includedir}/X11/extensions/geproto.h
-%{_includedir}/X11/extensions/lbxstr.h
-%{_includedir}/X11/extensions/mitmiscstr.h
-%{_includedir}/X11/extensions/multibuf.h
-%{_includedir}/X11/extensions/multibufst.h
+%{_includedir}/X11/extensions/lbx.h
+%{_includedir}/X11/extensions/lbxproto.h
+%{_includedir}/X11/extensions/mitmisc.h
+%{_includedir}/X11/extensions/mitmiscproto.h
+%{_includedir}/X11/extensions/multibufconst.h
+%{_includedir}/X11/extensions/multibufproto.h
 %{_includedir}/X11/extensions/panoramiXext.h
 %{_includedir}/X11/extensions/panoramiXproto.h
 %{_includedir}/X11/extensions/randr.h
@@ -197,13 +195,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/saver.h
 %{_includedir}/X11/extensions/saverproto.h
 %{_includedir}/X11/extensions/scrnsaver.h
-%{_includedir}/X11/extensions/security.h
-%{_includedir}/X11/extensions/securstr.h
-%{_includedir}/X11/extensions/shape.h
-%{_includedir}/X11/extensions/shapestr.h
-%{_includedir}/X11/extensions/shmstr.h
-%{_includedir}/X11/extensions/sync.h
-%{_includedir}/X11/extensions/syncstr.h
+%{_includedir}/X11/extensions/secur.h
+%{_includedir}/X11/extensions/securproto.h
+%{_includedir}/X11/extensions/shapeconst.h
+%{_includedir}/X11/extensions/shapeproto.h
+%{_includedir}/X11/extensions/shm.h
+%{_includedir}/X11/extensions/shmproto.h
+%{_includedir}/X11/extensions/syncconst.h
+%{_includedir}/X11/extensions/syncproto.h
 %{_includedir}/X11/extensions/vldXvMC.h
 %{_includedir}/X11/extensions/xcmiscstr.h
 %{_includedir}/X11/extensions/xf86bigfont.h
@@ -218,8 +217,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/xf86vmstr.h
 %{_includedir}/X11/extensions/xfixesproto.h
 %{_includedir}/X11/extensions/xfixeswire.h
-%{_includedir}/X11/extensions/xtestext1.h
-%{_includedir}/X11/extensions/xteststr.h
+%{_includedir}/X11/extensions/xtest.h
+%{_includedir}/X11/extensions/xtestext1const.h
+%{_includedir}/X11/extensions/xtestext1proto.h
+%{_includedir}/X11/extensions/xtestproto.h
 %dir %{_includedir}/X11/fonts
 %{_includedir}/X11/fonts/FS.h
 %{_includedir}/X11/fonts/FSproto.h
@@ -258,6 +259,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Tue Jul 21 2009 Adam Jackson <ajax@redhat.com> 7.4-22
+- xextproto 7.0.99.1
+- fixesproto snapshot
+
 * Thu Jul 16 2009 Adam Jackson <ajax@redhat.com> 7.4-21
 - randrproto 1.3.0