diff --git a/.cvsignore b/.cvsignore
index 43e049e..6c4db15 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,30 +1,4 @@
-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
+*.bz2
+*.gz
+clog
+xproto-7.0.2.tar.bz2
diff --git a/sources b/sources
index 8f727ce..08d23d2 100644
--- a/sources
+++ b/sources
@@ -26,5 +26,5 @@ a853ac74324824f259ce536ad2a43eea  xf86dgaproto-2.0.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
+f402ac6caf8927735bd15cd2dfc2cb08  xproto-7.0.2.tar.bz2
 2951543a1d5687d54db825bac2bffaed  xproxymanagementprotocol-1.0.1.tar.bz2
diff --git a/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec
index 4b046fe..b966812 100644
--- a/xorg-x11-proto-devel.spec
+++ b/xorg-x11-proto-devel.spec
@@ -5,44 +5,44 @@
 
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
-Version: 0.99.1
-Release: 2
+Version: 0.99.2
+Release: 1
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
-
-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
+%define sourceurl	http://xorg.freedesktop.org/releases/X11R7.0-RC2/everything
+Source0:  %{sourceurl}/bigreqsproto-1.0.1.tar.bz2
+Source1:  %{sourceurl}/compositeproto-0.2.1.tar.bz2
+Source2:  %{sourceurl}/damageproto-1.0.1.tar.bz2
+Source3:  %{sourceurl}/dmxproto-2.2.1.tar.bz2
+Source4:  %{sourceurl}/evieext-1.0.1.tar.bz2
+Source5:  %{sourceurl}/fixesproto-3.0.1.tar.bz2
+Source6:  %{sourceurl}/fontcacheproto-0.1.1.tar.bz2
+Source7:  %{sourceurl}/fontsproto-2.0.1.tar.bz2
+Source8:  %{sourceurl}/glproto-1.4.1.tar.bz2
+Source9:  %{sourceurl}/inputproto-1.3.1.tar.bz2
+Source10: %{sourceurl}/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
+#Source11: %{sourceurl}/panoramixproto-1.1.tar.bz2
+Source12: %{sourceurl}/printproto-1.0.1.tar.bz2
+Source13: %{sourceurl}/randrproto-1.1.1.tar.bz2
+Source14: %{sourceurl}/recordproto-1.13.1.tar.bz2
+Source15: %{sourceurl}/renderproto-0.9.1.tar.bz2
+Source16: %{sourceurl}/resourceproto-1.0.1.tar.bz2
+Source17: %{sourceurl}/scrnsaverproto-1.0.1.tar.bz2
+Source18: %{sourceurl}/trapproto-3.4.1.tar.bz2
+Source19: %{sourceurl}/videoproto-2.2.1.tar.bz2
+Source20: %{sourceurl}/xcmiscproto-1.1.1.tar.bz2
+Source21: %{sourceurl}/xextproto-7.0.1.tar.bz2
+Source22: %{sourceurl}/xf86bigfontproto-1.1.1.tar.bz2
+Source23: %{sourceurl}/xf86dgaproto-2.0.1.tar.bz2
+Source24: %{sourceurl}/xf86driproto-2.0.1.tar.bz2
+Source25: %{sourceurl}/xf86miscproto-0.9.1.tar.bz2
+Source26: %{sourceurl}/xf86rushproto-1.1.1.tar.bz2
+Source27: %{sourceurl}/xf86vidmodeproto-2.2.1.tar.bz2
+Source28: %{sourceurl}/xineramaproto-1.1.1.tar.bz2
+Source29: %{sourceurl}/xproto-7.0.2.tar.bz2
+Source30: %{sourceurl}/xproxymanagementprotocol-1.0.1.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -62,7 +62,6 @@ X.Org X11 Protocol headers
 # Proceed through each proto package directory, building them all
 for dir in $(ls -1) ; do
 	pushd $dir
-#	./autogen.sh
 	%configure
 	make %{?_smp_mflags}
 	popd
@@ -261,6 +260,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-1
+- Update to X11R7 RC2 release, picking up new xproto-7.0.2.
+
 * Thu Oct 20 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-2
 - This package contains only C header files and pkg-config *.pc files,
   and does not contain any ELF binaries or DSOs, so we disable debuginfo