diff --git a/.gitignore b/.gitignore
index fb56096..0cdc7a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,9 @@ dri2proto-2.2.tar.bz2
 glproto-1.4.11.tar.bz2
 dri2proto-2.3.tar.bz2
 xproto-7.0.17.tar.bz2
+glproto-1.4.12.tar.bz2
+renderproto-0.11.1.tar.bz2
+kbproto-1.0.5.tar.bz2
+xproto-7.0.18.tar.bz2
+xextproto-7.1.2.tar.bz2
+videoproto-2.3.1.tar.bz2
diff --git a/glproto-1.4.11-hyperpipe.patch b/glproto-1.4.11-hyperpipe.patch
deleted file mode 100644
index f39029c..0000000
--- a/glproto-1.4.11-hyperpipe.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up glproto-1.4.11/glxproto.h.jx glproto-1.4.11/glxproto.h
---- glproto-1.4.11/glxproto.h.jx	2010-01-08 11:43:07.000000000 -0500
-+++ glproto-1.4.11/glxproto.h	2010-08-04 09:59:21.000000000 -0400
-@@ -1255,7 +1255,7 @@ typedef struct {
- /*
- ** glXHyperpipeConfigSGIX request
- */
--typedef struct GLXHyperpipeConfigSGIX {
-+typedef struct {
-     CARD8       reqType;
-     CARD8       glxCode;
-     CARD16      length B16;
diff --git a/sources b/sources
index 6abe92a..d16f5e3 100644
--- a/sources
+++ b/sources
@@ -5,10 +5,8 @@ d30c5dbf19ca6dffcd9788227ecff8c5  bigreqsproto-1.1.0.tar.bz2
 5c74f61d6f77b2e6a083b2b31000be42  evieext-1.1.0.tar.bz2
 f3a857deadca3144fba041af1dbf7603  fontsproto-2.1.0.tar.bz2
 70f5998c673aa510e2acd6d8fb3799de  recordproto-1.14.tar.bz2
-b160a9733fe91b666e74fca284333148  renderproto-0.11.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
 a036dc2fcbf052ec10621fd48b68dbb1  xf86dgaproto-2.1.tar.bz2
@@ -17,12 +15,14 @@ a036dc2fcbf052ec10621fd48b68dbb1  xf86dgaproto-2.1.tar.bz2
 a8aadcb281b9c11a91303e24cdea45f5  xineramaproto-1.2.tar.bz2
 0f7acbc14a082f9ae03744396527d23d  inputproto-2.0.tar.bz2
 a5c244c36382b0de39b2828cea4b651d  randrproto-1.3.1.tar.bz2
-fb6ccaae76db7a35e49b12aea60ca6ff  xextproto-7.1.1.tar.bz2
 4c1cb4f2ed9f34de59f2f04783ca9483  fixesproto-4.1.1.tar.bz2
-7f439166a9b2bf81471a33951883019f  kbproto-1.0.4.tar.bz2
 ca63bbb31cf5b7f37b2237e923ff257a  xf86miscproto-0.9.3.tar.bz2
 9de22ca1522008c28fb03dfc41ba2d30  xproxymanagementprotocol-1.0.3.tar.bz2
 3ca8ddb42cd4ee31b8690031303221af  dri2proto-2.2.tar.bz2
-78e7c4dc7dcb74b1869fee7897e00f59  glproto-1.4.11.tar.bz2
 3407b494d5e90d584c9af52aa8f9f028  dri2proto-2.3.tar.bz2
-74abb8fb91af66f35873b1f444731220  xproto-7.0.17.tar.bz2
+55edc5ff2efb734215c868f72f7cf27e  glproto-1.4.12.tar.bz2
+a914ccc1de66ddeb4b611c6b0686e274  renderproto-0.11.1.tar.bz2
+e7edb59a3f54af15f749e8f3e314ee62  kbproto-1.0.5.tar.bz2
+6b8a34b274c6fceaffe57c579db826b9  xproto-7.0.18.tar.bz2
+263ae968b223c23b2986603d84e5c30e  xextproto-7.1.2.tar.bz2
+c3b348c6e2031b72b11ae63fc7f805c2  videoproto-2.3.1.tar.bz2
diff --git a/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec
index 88084e1..ef7c8ee 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: 38%{?dist}
+Release: 39%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -22,28 +22,26 @@ Source31: http://www.x.org/pub/individual/proto/dri2proto-2.3.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.1.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.11.tar.bz2
+Source8:  http://www.x.org/pub/individual/proto/glproto-1.4.12.tar.bz2
 Source9:  http://www.x.org/pub/individual/proto/inputproto-2.0.tar.bz2
-Source10: http://www.x.org/pub/individual/proto/kbproto-1.0.4.tar.bz2
+Source10: http://www.x.org/pub/individual/proto/kbproto-1.0.5.tar.bz2
 Source13: http://www.x.org/pub/individual/proto/randrproto-1.3.1.tar.bz2
 Source14: http://www.x.org/pub/individual/proto/recordproto-1.14.tar.bz2
-Source15: http://www.x.org/pub/individual/proto/renderproto-0.11.tar.bz2
+Source15: http://www.x.org/pub/individual/proto/renderproto-0.11.1.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
+Source19: http://www.x.org/pub/individual/proto/videoproto-2.3.1.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
+Source21: http://www.x.org/pub/individual/proto/xextproto-7.1.2.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.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.3.tar.bz2
 Source27: http://www.x.org/pub/individual/proto/xf86vidmodeproto-2.3.tar.bz2
 Source28: http://www.x.org/pub/individual/proto/xineramaproto-1.2.tar.bz2
-Source29: http://www.x.org/pub/individual/proto/xproto-7.0.17.tar.bz2
+Source29: http://www.x.org/pub/individual/proto/xproto-7.0.18.tar.bz2
 Source30: http://www.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.3.tar.bz2
 
-Patch0: glproto-1.4.11-hyperpipe.patch
-
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.0.2-1
 
@@ -60,7 +58,6 @@ X.Org X11 Protocol headers
 
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a7 -a8 -a9 -a10 -a13 -a14 -a15 -a16 -a17 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a27 -a28 -a29 -a30 -a31
-%patch0 -p0
 
 %build
 
@@ -99,6 +96,19 @@ rm -rf $RPM_BUILD_ROOT
 %doc fixesproto.txt
 %doc randrproto.txt
 %doc renderproto.txt
+%doc %{_docdir}/xextproto/appgroup.xml
+%doc %{_docdir}/xextproto/dbe.xml
+%doc %{_docdir}/xextproto/dpms.xml
+%doc %{_docdir}/xextproto/evi.xml
+%doc %{_docdir}/xextproto/geproto.xml
+%doc %{_docdir}/xextproto/multibuf.xml
+%doc %{_docdir}/xextproto/security.xml
+%doc %{_docdir}/xextproto/shape.xml
+%doc %{_docdir}/xextproto/shm.xml
+%doc %{_docdir}/xextproto/sync.xml
+%doc %{_docdir}/xextproto/tog-cup.xml
+%doc %{_docdir}/xextproto/xtest.xml
+%doc %{_docdir}/videoproto/xv-protocol-v2.txt
 %doc PM_spec
 %dir %{_includedir}/GL
 %{_includedir}/GL/glxint.h
@@ -198,10 +208,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/securproto.h
 %{_includedir}/X11/extensions/shapeconst.h
 %{_includedir}/X11/extensions/shapeproto.h
+%{_includedir}/X11/extensions/shapestr.h
 %{_includedir}/X11/extensions/shm.h
 %{_includedir}/X11/extensions/shmproto.h
+%{_includedir}/X11/extensions/shmstr.h
 %{_includedir}/X11/extensions/syncconst.h
 %{_includedir}/X11/extensions/syncproto.h
+%{_includedir}/X11/extensions/syncstr.h
 %{_includedir}/X11/extensions/vldXvMC.h
 %{_includedir}/X11/extensions/xcmiscproto.h
 %{_includedir}/X11/extensions/xcmiscstr.h
@@ -264,6 +277,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Thu Aug 12 2010 Peter Hutterer <peter.hutterer@redhat.com> 7.4-39
+- glproto-1.4.12
+- kbproto 1.0.5
+- renderproto 0.11.1
+- videoproto 2.3.1
+- xextproto 7.1.2
+- xproto 7.0.18
+
 * Wed Aug 04 2010 Adam Jackson <ajax@redhat.com> 7.4-38
 - glproto-1.4.11-hyperpipe.patch: Fix conflict with glxext.h