diff --git a/libXdmcp.spec b/libXdmcp.spec
index fb742fd..a9941df 100644
--- a/libXdmcp.spec
+++ b/libXdmcp.spec
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXdmcp runtime library
 Name: libXdmcp
 Version: 1.0.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -13,8 +13,6 @@ Patch0: libXdmcp-1.0.2-namespace-pollution.patch
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 
-Obsoletes: XFree86-libs, xorg-x11-libs
-
 %description
 X.Org X11 libXdmcp runtime library
 
@@ -23,11 +21,8 @@ Summary: X.Org X11 libXdmcp development package
 Group: Development/Libraries
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: %{name} = %{version}-%{release}
-
-# xorg-x11-proto-devel is needed by xdmcp.pc
 Requires: xorg-x11-proto-devel
-
-Obsoletes: XFree86-devel, xorg-x11-devel
+Requires: pkgconfig
 
 %description devel
 X.Org X11 libXdmcp development package
@@ -36,15 +31,9 @@ X.Org X11 libXdmcp development package
 %setup -q
 %patch0 -p1 -b .hidden
 
-# 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
@@ -62,7 +51,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog
+%doc AUTHORS COPYING ChangeLog
 %{_libdir}/libXdmcp.so.6
 %{_libdir}/libXdmcp.so.6.0.0
 
@@ -70,13 +59,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %dir %{_includedir}/X11/
 %{_includedir}/X11/Xdmcp.h
-%if %{with_static}
-%{_libdir}/libXdmcp.a
-%endif
 %{_libdir}/libXdmcp.so
 %{_libdir}/pkgconfig/xdmcp.pc
 
 %changelog
+* Sat Feb 21 2009 Adam Jackson <ajax@redhat.com> 1.0.2-7
+- Merge review cleanups. (#226068)
+
 * Tue Jul 15 2008 Adam Jackson <ajax@redhat.com> 1.0.2-6
 - Fix license tag.