diff --git a/libXpm.spec b/libXpm.spec
index e6ce5f3..8161ee4 100644
--- a/libXpm.spec
+++ b/libXpm.spec
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXpm runtime library
 Name: libXpm
-Version: 3.5.7
-Release: 7%{?dist}
+Version: 3.5.8
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -10,16 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
 BuildRequires: gettext
-BuildRequires: xorg-x11-proto-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
-# libXext-devel are required build deps in order to get sxpm built.
-BuildRequires: libXt-devel
-BuildRequires: libXext-devel
-BuildRequires: libXau-devel
-
+BuildRequires: pkgconfig(xext) pkgconfig(xt) pkgconfig(xau)
 
 %description
 X.Org X11 libXpm runtime library
@@ -29,23 +20,14 @@ Summary: X.Org X11 libXpm development package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
-Requires: libX11-devel pkgconfig
-
-
 %description devel
 X.Org X11 libXpm development package
 
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -73,9 +55,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/cxpm
 %{_bindir}/sxpm
 %{_includedir}/X11/xpm.h
-%if %{with_static}
-%{_libdir}/libXpm.a
-%endif
 %{_libdir}/libXpm.so
 %{_libdir}/pkgconfig/xpm.pc
 #%dir %{_mandir}/man1x
@@ -83,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 #%{_mandir}/man1/*.1x*
 
 %changelog
+* Tue Oct 13 2009 Adam Jackson <ajax@redhat.com> 3.5.8-1
+- libXpm 3.5.8
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.7-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild