diff --git a/.cvsignore b/.cvsignore
index 59035dc..b63a250 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,31 +1,28 @@
-bigreqsproto-1.0.2.tar.bz2
+bigreqsproto-1.1.0.tar.bz2
 compositeproto-0.4.tar.bz2
-damageproto-1.1.0.tar.bz2
-dmxproto-2.2.2.tar.bz2
-evieext-1.0.2.tar.bz2
-fixesproto-4.0.tar.bz2
-fontsproto-2.0.2.tar.bz2
+damageproto-1.2.0.tar.bz2
+dmxproto-2.2.99.1.tar.bz2
+evieext-1.1.0.tar.bz2
+fixesproto-4.1.tar.bz2
+fontsproto-2.1.0.tar.bz2
 glproto-1.4.9.tar.bz2
 kbproto-1.0.3.tar.bz2
 recordproto-1.13.99.1.tar.bz2
 renderproto-0.11.tar.bz2
-resourceproto-1.0.2.tar.bz2
-scrnsaverproto-1.1.0.tar.bz2
-videoproto-2.2.2.tar.bz2
-xcmiscproto-1.1.2.tar.bz2
-xextproto-7.0.4.tar.bz2
-xf86bigfontproto-1.1.2.tar.bz2
-xf86dgaproto-2.0.3.tar.bz2
-xf86driproto-2.0.4.tar.bz2
+resourceproto-1.1.0.tar.bz2
+scrnsaverproto-1.2.0.tar.bz2
+videoproto-2.3.0.tar.bz2
+xcmiscproto-1.2.0.tar.bz2
+xextproto-7.1.1.tar.bz2
+xf86bigfontproto-1.2.0.tar.bz2
+xf86dgaproto-2.0.99.1.tar.bz2
+xf86driproto-2.1.0.tar.bz2
 xf86miscproto-0.9.2.tar.bz2
-xf86vidmodeproto-2.2.2.tar.bz2
-xineramaproto-1.1.2.tar.bz2
+xf86vidmodeproto-2.2.99.1.tar.bz2
+xineramaproto-1.1.99.1.tar.bz2
 xproto-7.0.15.tar.bz2
 xproxymanagementprotocol-1.0.2.tar.bz2
-randrproto-1.2.99.3.tar.bz2
+randrproto-1.3.0.tar.bz2
 glproto-1.4.10.tar.bz2
 dri2proto-2.1.tar.bz2
 inputproto-1.9.99.902.tar.bz2
-randrproto-1.3.0.tar.bz2
-xextproto-7.1.1.tar.bz2
-fixesproto-4.1.tar.bz2
diff --git a/sources b/sources
index 94fec83..94fc7cb 100644
--- a/sources
+++ b/sources
@@ -1,22 +1,22 @@
-95c29d9d10bf2868996c0c47a3b9a8dc  bigreqsproto-1.0.2.tar.bz2
+d30c5dbf19ca6dffcd9788227ecff8c5  bigreqsproto-1.1.0.tar.bz2
 6281344d656d4e0c8e9db4918efe3d1d  compositeproto-0.4.tar.bz2
-33ee591e0b1ca5ad7902934541db7d24  damageproto-1.1.0.tar.bz2
-d80acad88411e7944b9b085463d53302  dmxproto-2.2.2.tar.bz2
-2507b5d0f4b2848147fbddd155aa6cfe  evieext-1.0.2.tar.bz2
-c946f166107b016a21cc7a02e1132724  fontsproto-2.0.2.tar.bz2
+434b931b02bd83ed9fc44951df81cdac  damageproto-1.2.0.tar.bz2
+7bd9ccde42f022725c0086bd93d269f3  dmxproto-2.2.99.1.tar.bz2
+5c74f61d6f77b2e6a083b2b31000be42  evieext-1.1.0.tar.bz2
+f3a857deadca3144fba041af1dbf7603  fontsproto-2.1.0.tar.bz2
 6092cdb0a1225f95356ddbe6c2abaad5  kbproto-1.0.3.tar.bz2
 1ab825ee2dbf32dd4a09cfca89d0fad7  recordproto-1.13.99.1.tar.bz2
 b160a9733fe91b666e74fca284333148  renderproto-0.11.tar.bz2
-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
-a318c1e86123832d7b0c95fc7d47ef35  xf86bigfontproto-1.1.2.tar.bz2
-42fdcebc66efac02ab4beec2b1b0ad6e  xf86dgaproto-2.0.3.tar.bz2
-01470d088da3a8a3deefa8e1f45d69cb  xf86driproto-2.0.4.tar.bz2
+84795594b3ebd2ee2570cf93340d152c  resourceproto-1.1.0.tar.bz2
+9040c991a56ee9b5976936f8c65d5c8a  scrnsaverproto-1.2.0.tar.bz2
+fb762146a18207a1e8bc9f299dfc7ac0  videoproto-2.3.0.tar.bz2
+7b83e4a7e9f4edc9c6cfb0500f4a7196  xcmiscproto-1.2.0.tar.bz2
+120e226ede5a4687b25dd357cc9b8efe  xf86bigfontproto-1.2.0.tar.bz2
+a0135bcc07009475a9db5aee362566fc  xf86dgaproto-2.0.99.1.tar.bz2
+309d552732666c3333d7dc63e80d042f  xf86driproto-2.1.0.tar.bz2
 acae8edeb05a406f7f60bcbb218a8f1d  xf86miscproto-0.9.2.tar.bz2
-f00844a63d6e76b69eb0eb5e41eed843  xf86vidmodeproto-2.2.2.tar.bz2
-1cc292c562962ad0ad3a253cae68c632  xineramaproto-1.1.2.tar.bz2
+128a61f6e275cb76566e4ce477631938  xf86vidmodeproto-2.2.99.1.tar.bz2
+ae9dde9a3a81880cb718b36d32198fcd  xineramaproto-1.1.99.1.tar.bz2
 1a2b31430d04340be2e49e8b6445e076  xproto-7.0.15.tar.bz2
 d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
 c9f8cebfba72bfab674bc0170551fb8d  glproto-1.4.10.tar.bz2
diff --git a/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec
index 9fdfeab..891aaae 100644
--- a/xorg-x11-proto-devel.spec
+++ b/xorg-x11-proto-devel.spec
@@ -7,38 +7,38 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.4
-Release: 30%{?dist}
+Release: 31%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-Source0:  http://www.x.org/pub/individual/proto/bigreqsproto-1.0.2.tar.bz2
+Source0:  http://www.x.org/pub/individual/proto/bigreqsproto-1.1.0.tar.bz2
 Source1:  http://www.x.org/pub/individual/proto/compositeproto-0.4.tar.bz2
-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
+Source2:  http://www.x.org/pub/individual/proto/damageproto-1.2.0.tar.bz2
+Source3:  http://www.x.org/pub/individual/proto/dmxproto-2.2.99.1.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
+Source4:  http://www.x.org/pub/individual/proto/evieext-1.1.0.tar.bz2
 Source5:  http://www.x.org/pub/individual/proto/fixesproto-4.1.tar.bz2
-Source7:  http://www.x.org/pub/individual/proto/fontsproto-2.0.2.tar.bz2
+Source7:  http://www.x.org/pub/individual/proto/fontsproto-2.1.0.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.902.tar.bz2
 Source10: http://www.x.org/pub/individual/proto/kbproto-1.0.3.tar.bz2
 Source13: http://www.x.org/pub/individual/proto/randrproto-1.3.0.tar.bz2
 Source14: http://www.x.org/pub/individual/proto/recordproto-1.13.99.1.tar.bz2
 Source15: http://www.x.org/pub/individual/proto/renderproto-0.11.tar.bz2
-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
+Source16: http://www.x.org/pub/individual/proto/resourceproto-1.1.0.tar.bz2
+Source17: http://www.x.org/pub/individual/proto/scrnsaverproto-1.2.0.tar.bz2
+Source19: http://www.x.org/pub/individual/proto/videoproto-2.3.0.tar.bz2
+Source20: http://www.x.org/pub/individual/proto/xcmiscproto-1.2.0.tar.bz2
 Source21: http://www.x.org/pub/individual/proto/xextproto-7.1.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
+Source22: http://www.x.org/pub/individual/proto/xf86bigfontproto-1.2.0.tar.bz2
+Source23: http://www.x.org/pub/individual/proto/xf86dgaproto-2.0.99.1.tar.bz2
+Source24: http://www.x.org/pub/individual/proto/xf86driproto-2.1.0.tar.bz2
 Source25: http://www.x.org/pub/individual/proto/xf86miscproto-0.9.2.tar.bz2
-Source27: http://www.x.org/pub/individual/proto/xf86vidmodeproto-2.2.2.tar.bz2
-Source28: http://www.x.org/pub/individual/proto/xineramaproto-1.1.2.tar.bz2
+Source27: http://www.x.org/pub/individual/proto/xf86vidmodeproto-2.2.99.1.tar.bz2
+Source28: http://www.x.org/pub/individual/proto/xineramaproto-1.1.99.1.tar.bz2
 Source29: http://www.x.org/pub/individual/proto/xproto-7.0.15.tar.bz2
 Source30: http://www.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2
 
@@ -138,6 +138,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/ap_keysym.h
 %dir %{_includedir}/X11/dri
 %{_includedir}/X11/dri/xf86dri.h
+%{_includedir}/X11/dri/xf86driproto.h
 %{_includedir}/X11/dri/xf86dristr.h
 %dir %{_includedir}/X11/extensions
 %{_includedir}/X11/extensions/EVI.h
@@ -153,13 +154,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/XKBstr.h
 %{_includedir}/X11/extensions/XResproto.h
 %{_includedir}/X11/extensions/Xeviestr.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/bigreqsproto.h
 %{_includedir}/X11/extensions/bigreqstr.h
 %{_includedir}/X11/extensions/composite.h
 %{_includedir}/X11/extensions/compositeproto.h
@@ -169,12 +170,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/damagewire.h
 %{_includedir}/X11/extensions/dbe.h
 %{_includedir}/X11/extensions/dbeproto.h
-%{_includedir}/X11/extensions/dmxext.h
+%{_includedir}/X11/extensions/dmx.h
 %{_includedir}/X11/extensions/dmxproto.h
 %{_includedir}/X11/extensions/dpmsconst.h
 %{_includedir}/X11/extensions/dpmsproto.h
 %{_includedir}/X11/extensions/dri2proto.h
 %{_includedir}/X11/extensions/dri2tokens.h
+%{_includedir}/X11/extensions/evieproto.h
 %{_includedir}/X11/extensions/ge.h
 %{_includedir}/X11/extensions/geproto.h
 %{_includedir}/X11/extensions/lbx.h
@@ -183,7 +185,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_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
 %{_includedir}/X11/extensions/randrproto.h
@@ -194,7 +195,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/renderproto.h
 %{_includedir}/X11/extensions/saver.h
 %{_includedir}/X11/extensions/saverproto.h
-%{_includedir}/X11/extensions/scrnsaver.h
 %{_includedir}/X11/extensions/secur.h
 %{_includedir}/X11/extensions/securproto.h
 %{_includedir}/X11/extensions/shapeconst.h
@@ -204,16 +204,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/syncconst.h
 %{_includedir}/X11/extensions/syncproto.h
 %{_includedir}/X11/extensions/vldXvMC.h
+%{_includedir}/X11/extensions/xcmiscproto.h
 %{_includedir}/X11/extensions/xcmiscstr.h
 %{_includedir}/X11/extensions/xf86bigfont.h
+%{_includedir}/X11/extensions/xf86bigfproto.h
 %{_includedir}/X11/extensions/xf86bigfstr.h
-%{_includedir}/X11/extensions/xf86dga.h
-%{_includedir}/X11/extensions/xf86dga1.h
+%{_includedir}/X11/extensions/xf86dga1const.h
+%{_includedir}/X11/extensions/xf86dga1proto.h
 %{_includedir}/X11/extensions/xf86dga1str.h
+%{_includedir}/X11/extensions/xf86dgaconst.h
+%{_includedir}/X11/extensions/xf86dgaproto.h
 %{_includedir}/X11/extensions/xf86dgastr.h
 %{_includedir}/X11/extensions/xf86misc.h
 %{_includedir}/X11/extensions/xf86mscstr.h
-%{_includedir}/X11/extensions/xf86vmode.h
+%{_includedir}/X11/extensions/xf86vm.h
+%{_includedir}/X11/extensions/xf86vmproto.h
 %{_includedir}/X11/extensions/xf86vmstr.h
 %{_includedir}/X11/extensions/xfixesproto.h
 %{_includedir}/X11/extensions/xfixeswire.h
@@ -259,6 +264,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Fri Aug 28 2009 Peter Hutterer <peter.hutterer@redhat.com> 7.4-31
+- bigreqsproto 1.1.0
+- damageproto 1.2.0
+- dmxproto 2.2.99.1
+- evieext 1.1.0
+- fontsproto 2.1.0
+- resourceproto 1.1.0
+- scrnsaverproto 1.2.0
+- videoproto 2.3.0
+- xcmiscproto 1.2.0
+- xf86bigfontproto 1.2.0
+- xf86dgaproto 2.0.99.1
+- xf86driproto 2.1.0
+- xf86vidmodeproto 2.2.99.1
+- xineramaproto 1.1.99.1
+
 * Tue Aug 25 2009 Peter Hutterer <peter.hutterer@redhat.com> 7.4-30
 - recordproto 1.13.99.1
 - xextproto 7.1.1