diff --git a/libXt.spec b/libXt.spec
index 5256f0e..af43dee 100644
--- a/libXt.spec
+++ b/libXt.spec
@@ -1,19 +1,17 @@
-%define pkgname libXt
 Summary: X.Org X11 libXt runtime library
-Name: xorg-x11-%{pkgname}
+Name: libXt
 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-proto-devel
-BuildRequires: xorg-x11-libX11-devel
-BuildRequires: xorg-x11-libSM-devel
+BuildRequires: libX11-devel
+BuildRequires: libSM-devel
 
-Provides: %{pkgname}
 Conflicts: XFree86-libs, xorg-x11-libs
 
 %description
@@ -25,23 +23,26 @@ Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: libSM-devel
 
-Provides: %{pkgname}-devel
 Conflicts: XFree86-devel, xorg-x11-devel
 
 %description devel
 X.Org X11 libXt 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}
 %makeinstall
 
 # We intentionally don't ship *.la files
@@ -55,12 +56,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc
+%doc AUTHORS COPYING README INSTALL ChangeLog
 %dir %{_libdir}
 %{_libdir}/libXt.so.6
 %{_libdir}/libXt.so.6.0.0
 
 %files devel
+%defattr(-,root,root,-)
 %dir %{_includedir}/X11
 # Listed explicitly instead of with glob, in order for rpm to autodetect
 # when any additions or removals happen.  ie: New Xprint support that we
@@ -98,7 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/Vendor.h
 %{_includedir}/X11/VendorP.h
 %{_includedir}/X11/Xtos.h
+%if %{with_static}
 %{_libdir}/libXt.a
+%endif
 %{_libdir}/libXt.so
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xt.pc
@@ -107,6 +111,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %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