diff --git a/libX11.spec b/libX11.spec
index 996dc11..b1058ee 100644
--- a/libX11.spec
+++ b/libX11.spec
@@ -5,23 +5,23 @@
 %define _x11localedir %{_libdir}/X11/locale
 #define _x11localedir %{_datadir}/X11/locale
 
-%define pkgname libX11
+
 Summary: X.Org X11 libX11 runtime library
-Name: xorg-x11-%{pkgname}
+Name: libX11
 Version: 0.99.0
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: %{pkgname}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{name}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: xorg-x11-xtrans-devel
 BuildRequires: libXau-devel
 BuildRequires: libXdmcp-devel
 
-Provides: %{pkgname}
+
 Conflicts: XFree86-libs, xorg-x11-libs
 
 %description
@@ -33,23 +33,29 @@ Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: xorg-x11-proto-devel
 
-Provides: %{pkgname}-devel
+
 Conflicts: XFree86-devel, xorg-x11-devel
 
 %description devel
 X.Org X11 libXdmcp development package
 
 %prep
-%setup -q -c %{name}-%{version}
+%setup -q
+
+# Disable static library creation by default.
+%define with_static 0
 
 %build
-cd %{pkgname}-%{version}
-%configure
+
+%configure \
+%if ! %{with_static}
+	--disable-static
+%endif
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd %{pkgname}-%{version}
+
 # FIXME: It seems upstream scripts do not like it if makeinstall is used.
 #%%makeinstall DESTDIR=$RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -65,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc
+%doc AUTHORS COPYING README INSTALL ChangeLog
 %dir %{_x11localedir}/C
 %{_x11localedir}/C/*
 %dir %{_x11localedir}/armscii-8
@@ -201,6 +207,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libX11.so.6.2.0
 
 %files devel
+%defattr(-,root,root,-)
 %dir %{_includedir}/X11
 %{_includedir}/X11/ImUtil.h
 %{_includedir}/X11/XKBlib.h
@@ -213,7 +220,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/Xresource.h
 %{_includedir}/X11/Xutil.h
 %{_includedir}/X11/cursorfont.h
+%if %{with_static}
 %{_libdir}/libX11.a
+%endif
 %{_libdir}/libX11.so
 %dir %{_libdir}
 %dir %{_libdir}/pkgconfig
@@ -222,6 +231,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3x/*.3x*
 
 %changelog
+* Thu Sep 29 2005 Mike A. Harris <mharris.com> 0.99.0-3
+- Renamed package to remove xorg-x11 from the name due to unanimous decision
+  between developers.
+- Use Fedora Extras style BuildRoot tag.
+- Disable static library creation by default.
+- Add missing defattr to devel subpackage
+- Add missing documentation files to doc macro
+
 * Tue Aug 23 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-2
 - Renamed package to prepend "xorg-x11" to the name for consistency with
   the rest of the X11R7 packages.