diff --git a/libXmu.spec b/libXmu.spec
index 9256694..922e826 100644
--- a/libXmu.spec
+++ b/libXmu.spec
@@ -1,19 +1,17 @@
-%define pkgname libXmu
 Summary: X.Org X11 libXmu/libXmuu runtime libraries
-Name: xorg-x11-%{pkgname}
+Name: libXmu
 Version: 0.99.0
-Release: 3
+Release: 4
 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-libX11-devel
-BuildRequires: xorg-x11-libXext-devel
-BuildRequires: xorg-x11-libXt-devel
+BuildRequires: libX11-devel
+BuildRequires: libXext-devel
+BuildRequires: libXt-devel
 
-Provides: %{pkgname}
 Conflicts: XFree86-libs, xorg-x11-libs
 
 %description
@@ -24,22 +22,27 @@ Summary: X.Org X11 libXmu development package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
-Provides: %{pkgname}-devel
 Conflicts: XFree86-devel, xorg-x11-devel
 
 %description devel
 X.Org X11 libXmu 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
-cd %{pkgname}-%{version}
+
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
@@ -54,7 +57,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc
+%doc AUTHORS COPYING README INSTALL ChangeLog
 %dir %{_libdir}
 %{_libdir}/libXmu.so.6
 %{_libdir}/libXmu.so.6.2.0
@@ -62,6 +65,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXmuu.so.1.0.0
 
 %files devel
+%defattr(-,root,root,-)
 %dir %{_includedir}/X11
 %dir %{_includedir}/X11/Xmu
 %{_includedir}/X11/Xmu/Atoms.h
@@ -86,15 +90,26 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/Xmu/WinUtil.h
 %{_includedir}/X11/Xmu/Xct.h
 %{_includedir}/X11/Xmu/Xmu.h
+%if %{with_static}
 %{_libdir}/libXmu.a
-%{_libdir}/libXmu.so
 %{_libdir}/libXmuu.a
+%endif
+%{_libdir}/libXmu.so
 %{_libdir}/libXmuu.so
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xmu.pc
 %{_libdir}/pkgconfig/xmuu.pc
 
 %changelog
+* Thu Sep 29 2005 Mike A. Harris <mharris.com> 0.99.0-4
+- 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
+- Fix BuildRequires to use new style X library package names
+
 * Wed Aug 24 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-3
 - Changed all virtual BuildRequires to the "xorg-x11-" prefixed non-virtual
   package names, as we want xorg-x11 libs to explicitly build against