diff --git a/libICE.spec b/libICE.spec
index 726c784..f3872d4 100644
--- a/libICE.spec
+++ b/libICE.spec
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libICE runtime library
 Name: libICE
 Version: 1.0.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -13,8 +13,6 @@ BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-5
 
-Obsoletes: XFree86-libs, xorg-x11-libs
-
 %description
 X.Org X11 libICE runtime library
 
@@ -23,26 +21,18 @@ Summary: X.Org X11 libICE development package
 Group: Development/Libraries
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: %{name} = %{version}-%{release}
-
+Requires: pkgconfig
 Requires: xorg-x11-proto-devel
 
-Obsoletes: XFree86-devel, xorg-x11-devel
-
 %description devel
 X.Org X11 libICE development package
 
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
-%configure \
-%if ! %{with_static}
-       --disable-static
-%endif
-make
+%configure --disable-static
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -60,21 +50,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
+%doc AUTHORS COPYING ChangeLog
 %{_libdir}/libICE.so.6
 %{_libdir}/libICE.so.6.3.0
 
 %files devel
+%defattr(-,root,root,-)
 %dir %{_includedir}/X11
 %dir %{_includedir}/X11/ICE
 %{_includedir}/X11/ICE/*.h
-%if %{with_static}
-%{_libdir}/libICE.a
-%endif
 %{_libdir}/libICE.so
 %{_libdir}/pkgconfig/ice.pc
 
 %changelog
+* Sat Feb 21 2009 Adam Jackson <ajax@redhat.com> 1.0.4-5
+- Merge review cleanups. (#226027)
+
 * Tue Jul 15 2008 Adam Jackson <ajax@redhat.com> 1.0.4-4
 - Fix license tag.