diff --git a/.cvsignore b/.cvsignore
index 45948ae..43e049e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,32 +1,30 @@
-bigreqsproto-1.0.tar.bz2
-compositeproto-0.2.tar.bz2
-damageproto-1.0.tar.bz2
-dmxproto-2.2.tar.bz2
-evieext-1.0.tar.bz2
-fixesproto-3.0.tar.bz2
-fontcacheproto-0.1.tar.bz2
-fontsproto-2.0.tar.bz2
-glproto-1.4.tar.bz2
-inputproto-1.3.tar.bz2
-kbproto-1.0.tar.bz2
-panoramixproto-1.1.tar.bz2
-printproto-1.0.tar.bz2
-randrproto-1.1.tar.bz2
-recordproto-1.13.tar.bz2
-renderproto-0.9.tar.bz2
-resourceproto-1.0.tar.bz2
-scrnsaverproto-1.0.tar.bz2
-trapproto-3.4.tar.bz2
-videoproto-2.2.tar.bz2
-xcmiscproto-1.1.tar.bz2
-xextproto-7.0.tar.bz2
-xf86bigfontproto-1.1.tar.bz2
-xf86dgaproto-2.0.tar.bz2
-xf86driproto-2.0.tar.bz2
-xf86miscproto-0.9.tar.bz2
-xf86rushproto-1.1.tar.bz2
-xf86vidmodeproto-2.2.tar.bz2
-xineramaproto-1.1.tar.bz2
-xproto-7.0.tar.bz2
-xproxymanagementprotocol-1.0.tar.bz2
-kbproto-1.0-cvs20050912.tar.bz2
+bigreqsproto-1.0.1.tar.bz2
+compositeproto-0.2.1.tar.bz2
+damageproto-1.0.1.tar.bz2
+dmxproto-2.2.1.tar.bz2
+evieext-1.0.1.tar.bz2
+fixesproto-3.0.1.tar.bz2
+fontcacheproto-0.1.1.tar.bz2
+fontsproto-2.0.1.tar.bz2
+glproto-1.4.1.tar.bz2
+inputproto-1.3.1.tar.bz2
+kbproto-1.0.1.tar.bz2
+printproto-1.0.1.tar.bz2
+randrproto-1.1.1.tar.bz2
+recordproto-1.13.1.tar.bz2
+renderproto-0.9.1.tar.bz2
+resourceproto-1.0.1.tar.bz2
+scrnsaverproto-1.0.1.tar.bz2
+trapproto-3.4.1.tar.bz2
+videoproto-2.2.1.tar.bz2
+xcmiscproto-1.1.1.tar.bz2
+xextproto-7.0.1.tar.bz2
+xf86bigfontproto-1.1.1.tar.bz2
+xf86dgaproto-2.0.1.tar.bz2
+xf86driproto-2.0.1.tar.bz2
+xf86miscproto-0.9.1.tar.bz2
+xf86rushproto-1.1.1.tar.bz2
+xf86vidmodeproto-2.2.1.tar.bz2
+xineramaproto-1.1.1.tar.bz2
+xproto-7.0.1.tar.bz2
+xproxymanagementprotocol-1.0.1.tar.bz2
diff --git a/sources b/sources
index 73c7c37..8f727ce 100644
--- a/sources
+++ b/sources
@@ -1,31 +1,30 @@
-c7a060b896a63b4f095aa6df39bd81b7  bigreqsproto-1.0.tar.bz2
-8bfca3769b259d22351dae3c05f619e0  compositeproto-0.2.tar.bz2
-ecd46638de86ecce26cdd68136bd8c1f  damageproto-1.0.tar.bz2
-6d0cdf1481085555445429dfe54abefa  dmxproto-2.2.tar.bz2
-e27f5064bff5c70b728871e176d4b2fa  evieext-1.0.tar.bz2
-001a51cca8e764e362fe98e61c22d54e  fixesproto-3.0.tar.bz2
-9ff9d0d855b365517b8ad7397f68a907  fontcacheproto-0.1.tar.bz2
-8ff6548d1c31975b832ecd4a7e7ede3d  fontsproto-2.0.tar.bz2
-9cda6fbdcc75f6d7d9cd1d3839264609  glproto-1.4.tar.bz2
-a23730f0f928ee108ff7701c12c85137  inputproto-1.3.tar.bz2
-b837c77b233fa2bf184ad7fb2495cb52  panoramixproto-1.1.tar.bz2
-b505c29bf1c23241d017a6d2a0b2a2e0  printproto-1.0.tar.bz2
-bd22688abe231c40deba07220cf0a960  randrproto-1.1.tar.bz2
-7f29896d5a14f433f38e1eb8b643b779  recordproto-1.13.tar.bz2
-358e263c627aa1d44094cbdb1e883a99  renderproto-0.9.tar.bz2
-83faf6d7e354848e8ec1bdd5d89ab7a4  resourceproto-1.0.tar.bz2
-3c2772460360fafbc36ccf4c8c4431a8  scrnsaverproto-1.0.tar.bz2
-12ea7125950f7e5f989f4df2858978e0  trapproto-3.4.tar.bz2
-0228ce195ce44cbb84e9785ed32fc98c  videoproto-2.2.tar.bz2
-4ca773736b114e159969acac2217a347  xcmiscproto-1.1.tar.bz2
-4a79413948de6a6c24dc4d17cde36caa  xextproto-7.0.tar.bz2
-64e07e66df4df483f221492bac2edef6  xf86bigfontproto-1.1.tar.bz2
-a0137326198c08d024ebf43cc786460d  xf86dgaproto-2.0.tar.bz2
-d7e2ceb28f2f9833391d0a8adf7fcfe5  xf86driproto-2.0.tar.bz2
-3ea64e4a9a04881fff49152726be98da  xf86miscproto-0.9.tar.bz2
-61ba57edd16ef37894f0d9f13ac5bb67  xf86rushproto-1.1.tar.bz2
-b4992e018e9a620ee4ec619485811233  xf86vidmodeproto-2.2.tar.bz2
-91d70352ee2c7c8c3f848981719b90f3  xineramaproto-1.1.tar.bz2
-360b01ad138326e674641ae931db871f  xproto-7.0.tar.bz2
-e760fb19358b4f4895f12759d60f7f62  xproxymanagementprotocol-1.0.tar.bz2
-4a92ba854a11bc17f5ef531c398bb8b5  kbproto-1.0-cvs20050912.tar.bz2
+fb5b31482d67661d29931d816736aa50  bigreqsproto-1.0.1.tar.bz2
+163f8e87555bcf9c402ae2be9d7ac7c3  compositeproto-0.2.1.tar.bz2
+ba4363b50409e53d5370f86f06ca8ae0  damageproto-1.0.1.tar.bz2
+4ad016fe64688c54730b47551e96f7c1  dmxproto-2.2.1.tar.bz2
+f20be452f3953ef3778982a669225115  evieext-1.0.1.tar.bz2
+dc3c1df35b16bfd673e55b83cab8b361  fixesproto-3.0.1.tar.bz2
+c603e10bbc73689f5bd4ffa5e24f3d29  fontcacheproto-0.1.1.tar.bz2
+ec23e17f0cb54b15ff31e846704c849f  fontsproto-2.0.1.tar.bz2
+dd439aa517177697d60d7ee6cdbc614f  glproto-1.4.1.tar.bz2
+6710bb1961bcceb099a1635c1f101016  inputproto-1.3.1.tar.bz2
+3506c6d4698afc5ecc9927cd06ab4329  kbproto-1.0.1.tar.bz2
+e774a64e265aaacd7969f762633b4447  printproto-1.0.1.tar.bz2
+ea9b416b620041352a67670bac2cc017  randrproto-1.1.1.tar.bz2
+e858fe69ff4ce7bcdaa850d8a3631b17  recordproto-1.13.1.tar.bz2
+41b7006bb3de16df85380fa0309bb3fd  renderproto-0.9.1.tar.bz2
+2cd11f087cca67382808c5f64579bdf7  resourceproto-1.0.1.tar.bz2
+9f82f6ce451b0d2543af405c91631a73  scrnsaverproto-1.0.1.tar.bz2
+12cee4cf212facd7c4a1a2dab02ca731  trapproto-3.4.1.tar.bz2
+83245b434f77aeef2ba69b88153422a2  videoproto-2.2.1.tar.bz2
+e3e6ee6862982f2b2d7a0fc7f483869e  xcmiscproto-1.1.1.tar.bz2
+2ad511ee64710d58497f294fa3035423  xextproto-7.0.1.tar.bz2
+e93b1b833a0531e546bf6f4cfbde4786  xf86bigfontproto-1.1.1.tar.bz2
+a853ac74324824f259ce536ad2a43eea  xf86dgaproto-2.0.1.tar.bz2
+705f6b2ae275dce556689f7774770847  xf86driproto-2.0.1.tar.bz2
+4abf4c8338ae6319c14fb6661c4f35f0  xf86miscproto-0.9.1.tar.bz2
+eb2e5a127aa828b13c50b0f396f28f18  xf86rushproto-1.1.1.tar.bz2
+e125b82299fa2e9c955e2277744694c6  xf86vidmodeproto-2.2.1.tar.bz2
+dc7a13f4a128513ebad675b35eb36b58  xineramaproto-1.1.1.tar.bz2
+5fcb850e1779a93d85ae7c59a3852b86  xproto-7.0.1.tar.bz2
+2951543a1d5687d54db825bac2bffaed  xproxymanagementprotocol-1.0.1.tar.bz2
diff --git a/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec
index 7efc09c..bd94f0b 100644
--- a/xorg-x11-proto-devel.spec
+++ b/xorg-x11-proto-devel.spec
@@ -1,42 +1,43 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
-Version: 0.0.1
-Release: 3
+Version: 0.99.1
+Release: 1
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
 
-Source0:  http://xorg.freedesktop.org/X11R7.0-RC0/everything/bigreqsproto-1.0.tar.bz2
-Source1:  http://xorg.freedesktop.org/X11R7.0-RC0/everything/compositeproto-0.2.tar.bz2
-Source2:  http://xorg.freedesktop.org/X11R7.0-RC0/everything/damageproto-1.0.tar.bz2
-Source3:  http://xorg.freedesktop.org/X11R7.0-RC0/everything/dmxproto-2.2.tar.bz2
-Source4:  http://xorg.freedesktop.org/X11R7.0-RC0/everything/evieext-1.0.tar.bz2
-Source5:  http://xorg.freedesktop.org/X11R7.0-RC0/everything/fixesproto-3.0.tar.bz2
-Source6:  http://xorg.freedesktop.org/X11R7.0-RC0/everything/fontcacheproto-0.1.tar.bz2
-Source7:  http://xorg.freedesktop.org/X11R7.0-RC0/everything/fontsproto-2.0.tar.bz2
-Source8:  http://xorg.freedesktop.org/X11R7.0-RC0/everything/glproto-1.4.tar.bz2
-Source9:  http://xorg.freedesktop.org/X11R7.0-RC0/everything/inputproto-1.3.tar.bz2
-Source10: http://xorg.freedesktop.org/X11R7.0-RC0/everything/kbproto-1.0-cvs20050912.tar.bz2
-Source11: http://xorg.freedesktop.org/X11R7.0-RC0/everything/panoramixproto-1.1.tar.bz2
-Source12: http://xorg.freedesktop.org/X11R7.0-RC0/everything/printproto-1.0.tar.bz2
-Source13: http://xorg.freedesktop.org/X11R7.0-RC0/everything/randrproto-1.1.tar.bz2
-Source14: http://xorg.freedesktop.org/X11R7.0-RC0/everything/recordproto-1.13.tar.bz2
-Source15: http://xorg.freedesktop.org/X11R7.0-RC0/everything/renderproto-0.9.tar.bz2
-Source16: http://xorg.freedesktop.org/X11R7.0-RC0/everything/resourceproto-1.0.tar.bz2
-Source17: http://xorg.freedesktop.org/X11R7.0-RC0/everything/scrnsaverproto-1.0.tar.bz2
-Source18: http://xorg.freedesktop.org/X11R7.0-RC0/everything/trapproto-3.4.tar.bz2
-Source19: http://xorg.freedesktop.org/X11R7.0-RC0/everything/videoproto-2.2.tar.bz2
-Source20: http://xorg.freedesktop.org/X11R7.0-RC0/everything/xcmiscproto-1.1.tar.bz2
-Source21: http://xorg.freedesktop.org/X11R7.0-RC0/everything/xextproto-7.0.tar.bz2
-Source22: http://xorg.freedesktop.org/X11R7.0-RC0/everything/xf86bigfontproto-1.1.tar.bz2
-Source23: http://xorg.freedesktop.org/X11R7.0-RC0/everything/xf86dgaproto-2.0.tar.bz2
-Source24: http://xorg.freedesktop.org/X11R7.0-RC0/everything/xf86driproto-2.0.tar.bz2
-Source25: http://xorg.freedesktop.org/X11R7.0-RC0/everything/xf86miscproto-0.9.tar.bz2
-Source26: http://xorg.freedesktop.org/X11R7.0-RC0/everything/xf86rushproto-1.1.tar.bz2
-Source27: http://xorg.freedesktop.org/X11R7.0-RC0/everything/xf86vidmodeproto-2.2.tar.bz2
-Source28: http://xorg.freedesktop.org/X11R7.0-RC0/everything/xineramaproto-1.1.tar.bz2
-Source29: http://xorg.freedesktop.org/X11R7.0-RC0/everything/xproto-7.0.tar.bz2
-Source30: http://xorg.freedesktop.org/X11R7.0-RC0/everything/xproxymanagementprotocol-1.0.tar.bz2
+Source0:  http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/bigreqsproto-1.0.1.tar.bz2
+Source1:  http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/compositeproto-0.2.1.tar.bz2
+Source2:  http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/damageproto-1.0.1.tar.bz2
+Source3:  http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/dmxproto-2.2.1.tar.bz2
+Source4:  http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/evieext-1.0.1.tar.bz2
+Source5:  http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/fixesproto-3.0.1.tar.bz2
+Source6:  http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/fontcacheproto-0.1.1.tar.bz2
+Source7:  http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/fontsproto-2.0.1.tar.bz2
+Source8:  http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/glproto-1.4.1.tar.bz2
+Source9:  http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/inputproto-1.3.1.tar.bz2
+Source10: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/kbproto-1.0.1.tar.bz2
+# NOTE: What once was known as PanoramiX, is now known as Xinerama
+#Source11: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/panoramixproto-1.1.tar.bz2
+Source12: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/printproto-1.0.1.tar.bz2
+Source13: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/randrproto-1.1.1.tar.bz2
+Source14: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/recordproto-1.13.1.tar.bz2
+Source15: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/renderproto-0.9.1.tar.bz2
+Source16: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/resourceproto-1.0.1.tar.bz2
+Source17: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/scrnsaverproto-1.0.1.tar.bz2
+Source18: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/trapproto-3.4.1.tar.bz2
+Source19: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/videoproto-2.2.1.tar.bz2
+Source20: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/xcmiscproto-1.1.1.tar.bz2
+Source21: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/xextproto-7.0.1.tar.bz2
+Source22: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/xf86bigfontproto-1.1.1.tar.bz2
+Source23: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/xf86dgaproto-2.0.1.tar.bz2
+Source24: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/xf86driproto-2.0.1.tar.bz2
+Source25: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/xf86miscproto-0.9.1.tar.bz2
+Source26: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/xf86rushproto-1.1.1.tar.bz2
+Source27: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/xf86vidmodeproto-2.2.1.tar.bz2
+Source28: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/xineramaproto-1.1.1.tar.bz2
+Source29: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/xproto-7.0.1.tar.bz2
+Source30: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/xproxymanagementprotocol-1.0.1.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -48,7 +49,7 @@ Conflicts: XFree86-devel, xorg-x11-devel
 X.Org X11 Protocol headers
 
 %prep
-%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30
+%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30
 
 %build
 #ls -al
@@ -77,14 +78,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc
 %dir %{_includedir}/GL
-%{_includedir}/GL/glu.h
-%{_includedir}/GL/glx.h
 %{_includedir}/GL/glxint.h
 %{_includedir}/GL/glxmd.h
 %{_includedir}/GL/glxproto.h
 %{_includedir}/GL/glxtokens.h
 %dir %{_includedir}/GL/internal
 %{_includedir}/GL/internal/glcore.h
+%{_includedir}/GL/internal/dri_interface.h
 %dir %{_includedir}/X11
 %{_includedir}/X11/DECkeysym.h
 %{_includedir}/X11/HPkeysym.h
@@ -235,7 +235,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/glproto.pc
 %{_libdir}/pkgconfig/inputproto.pc
 %{_libdir}/pkgconfig/kbproto.pc
-%{_libdir}/pkgconfig/panoramixproto.pc
 %{_libdir}/pkgconfig/printproto.pc
 %{_libdir}/pkgconfig/randrproto.pc
 %{_libdir}/pkgconfig/recordproto.pc
@@ -257,6 +256,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Thu Oct 20 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-1
+- Update all tarballs to X11R7 RC1 release.
+- Remove panoramixproto, as it is now known as xineramaproto.
+- Remove glu.h and glx.h from file manifest, as they're provided by Mesa.
+- Added {_includedir}/GL/internal/dri_interface.h to file manifest.
+
 * Sun Oct  2 2005 Mike A. Harris <mharris@redhat.com> 0.0.1-3
 - Use Fedora-Extras style BuildRoot
 - Invoke make with _smp_mflags