diff --git a/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec
index ff7f04f..7efc09c 100644
--- a/xorg-x11-proto-devel.spec
+++ b/xorg-x11-proto-devel.spec
@@ -1,44 +1,44 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 0.0.1
-Release: 2
+Release: 3
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
-# All of these were downloaded from:  http://xorg.freedesktop.org/X11R7.0-RC0/proto
-Source0:  bigreqsproto-1.0.tar.bz2
-Source1:  compositeproto-0.2.tar.bz2
-Source2:  damageproto-1.0.tar.bz2
-Source3:  dmxproto-2.2.tar.bz2
-Source4:  evieext-1.0.tar.bz2
-Source5:  fixesproto-3.0.tar.bz2
-Source6:  fontcacheproto-0.1.tar.bz2
-Source7:  fontsproto-2.0.tar.bz2
-Source8:  glproto-1.4.tar.bz2
-Source9:  inputproto-1.3.tar.bz2
-Source10: kbproto-1.0-cvs20050912.tar.bz2
-Source11: panoramixproto-1.1.tar.bz2
-Source12: printproto-1.0.tar.bz2
-Source13: randrproto-1.1.tar.bz2
-Source14: recordproto-1.13.tar.bz2
-Source15: renderproto-0.9.tar.bz2
-Source16: resourceproto-1.0.tar.bz2
-Source17: scrnsaverproto-1.0.tar.bz2
-Source18: trapproto-3.4.tar.bz2
-Source19: videoproto-2.2.tar.bz2
-Source20: xcmiscproto-1.1.tar.bz2
-Source21: xextproto-7.0.tar.bz2
-Source22: xf86bigfontproto-1.1.tar.bz2
-Source23: xf86dgaproto-2.0.tar.bz2
-Source24: xf86driproto-2.0.tar.bz2
-Source25: xf86miscproto-0.9.tar.bz2
-Source26: xf86rushproto-1.1.tar.bz2
-Source27: xf86vidmodeproto-2.2.tar.bz2
-Source28: xineramaproto-1.1.tar.bz2
-Source29: xproto-7.0.tar.bz2
-Source30: xproxymanagementprotocol-1.0.tar.bz2
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+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
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: xorg-x11-util-macros
 
@@ -58,7 +58,7 @@ for dir in $(ls -1) ; do
 	pushd $dir
 #	./autogen.sh
 	%configure
-	make
+	make %{?_smp_mflags}
 	popd
 done
 
@@ -257,6 +257,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Sun Oct  2 2005 Mike A. Harris <mharris@redhat.com> 0.0.1-3
+- Use Fedora-Extras style BuildRoot
+- Invoke make with _smp_mflags
+- Add full URLs to SourceN lines
+
 * Mon Sep 12 2005 Kristian Høgsberg <krh@redhat.com> 0.0.1-2
 - Update to 20050912 cvs snapshot of kbproto.