diff --git a/libXcomposite.spec b/libXcomposite.spec
index fc1f5ce..8554e23 100644
--- a/libXcomposite.spec
+++ b/libXcomposite.spec
@@ -1,20 +1,20 @@
-%define pkgname libXcomposite
+
 Summary: X.Org X11 libXcomposite runtime library
-Name: xorg-x11-%{pkgname}
+Name: libXcomposite
 Version: 0.2.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: libX11-devel
 BuildRequires: libXext-devel
 BuildRequires: libXfixes-devel
 
-Provides: %{pkgname}
+
 Conflicts: XFree86-libs, xorg-x11-libs
 
 %description
@@ -25,22 +25,28 @@ Summary: X.Org X11 libXcomposite development package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
-Provides: %{pkgname}-devel
+
 Conflicts: XFree86-devel, xorg-x11-devel
 
 %description devel
 X.Org X11 libXcomposite 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
 
@@ -55,21 +61,32 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc
+%doc AUTHORS COPYING README INSTALL ChangeLog
 %dir %{_libdir}
 %{_libdir}/libXcomposite.so.1
 %{_libdir}/libXcomposite.so.1.0.0
 
 %files devel
+%defattr(-,root,root,-)
 %dir %{_includedir}/X11
 %dir %{_includedir}/X11/extensions
 %{_includedir}/X11/extensions/Xcomposite.h
+%if %{with_static}
 %{_libdir}/libXcomposite.a
+%endif
 %{_libdir}/libXcomposite.so
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xcomposite.pc
 
 %changelog
+* Thu Sep 29 2005 Mike A. Harris <mharris.com> 0.2.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.2.0-2
 - Renamed package to prepend "xorg-x11" to the name for consistency with
   the rest of the X11R7 packages.