diff --git a/libXpm.spec b/libXpm.spec
index 2d49d3f..0b2fadb 100644
--- a/libXpm.spec
+++ b/libXpm.spec
@@ -1,16 +1,15 @@
-%define pkgname libXpm
 Summary: X.Org X11 libXpm runtime library
-Name: xorg-x11-%{pkgname}
+Name: libXpm
 Version: 3.5.2
-Release: 4
+Release: 5
 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: libX11-devel
 # FIXME: Although ./configure checks for libXt and libXext, and indicates
 # that they are missing, it continues to build anyway, and just does not
 # build sxpm if they are not present.  Therefore, libXt-devel and
@@ -48,8 +47,6 @@ rpmlib(PayloadFilesHavePrefix) <= 4.0-1
 xorg-x11-libXpm = 3.5.2-2
 %endif
 
-
-Provides: %{pkgname}
 Conflicts: XFree86-libs, xorg-x11-libs
 
 %description
@@ -60,22 +57,25 @@ Summary: X.Org X11 libXpm development package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
-Provides: %{pkgname}-devel
 Conflicts: XFree86-devel, xorg-x11-devel
 
 %description devel
 X.Org X11 libXpm 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
 
@@ -90,23 +90,35 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc
+%doc AUTHORS COPYING README INSTALL ChangeLog
 %dir %{_libdir}
 %{_libdir}/libXpm.so.4
 %{_libdir}/libXpm.so.4.11.0
 
 %files devel
 %defattr(-,root,root,-)
+%defattr(-,root,root,-)
 %{_bindir}/cxpm
 %{_bindir}/sxpm
 %dir %{_includedir}/X11
 %{_includedir}/X11/xpm.h
+%if %{with_static}
 %{_libdir}/libXpm.a
+%endif
 %{_libdir}/libXpm.so
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xpm.pc
 
 %changelog
+* Thu Sep 29 2005 Mike A. Harris <mharris.com> 3.5.2-5
+- 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
+
 * Sun Sep 4 2005 Mike A. Harris <mharris@redhat.com> 3.5.2-4
 - Although ./configure checks for libXt and libXext, and indicates
   that they are missing, it continues to build anyway, and just does not