diff --git a/libXext.spec b/libXext.spec
index f632b07..2ca370c 100644
--- a/libXext.spec
+++ b/libXext.spec
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXext runtime library
 Name: libXext
 Version: 1.0.1
-Release: 1
+Release: 2
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -21,10 +21,11 @@ X.Org X11 libXext runtime library
 %package devel
 Summary: X.Org X11 libXext development package
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name} = %{version}-%{release}
 
 Requires: libX11-devel
+# xorg-x11-proto-devel is needed by xext.pc
 Requires: xorg-x11-proto-devel >= 7.0-1
 
 Obsoletes: XFree86-devel, xorg-x11-devel
@@ -47,9 +48,9 @@ X.Org X11 libXext development package
 make
 
 %install
-
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -63,7 +64,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README INSTALL ChangeLog
-%dir %{_libdir}
 %{_libdir}/libXext.so.6
 %{_libdir}/libXext.so.6.4.0
 
@@ -73,63 +73,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libXext.a
 %endif
 %{_libdir}/libXext.so
-%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xext.pc
-%dir %{_mandir}
-%dir %{_mandir}/man3
-# NOTE: manpages listed individually so that rpm detects if any go missing
-%{_mandir}/man3/DBE.3x*
-%{_mandir}/man3/DPMSCapable.3x*
-%{_mandir}/man3/DPMSDisable.3x*
-%{_mandir}/man3/DPMSEnable.3x*
-%{_mandir}/man3/DPMSForceLevel.3x*
-%{_mandir}/man3/DPMSGetTimeouts.3x*
-%{_mandir}/man3/DPMSGetVersion.3x*
-%{_mandir}/man3/DPMSInfo.3x*
-%{_mandir}/man3/DPMSQueryExtension.3x*
-%{_mandir}/man3/DPMSSetTimeouts.3x*
-%{_mandir}/man3/XShape.3x*
-%{_mandir}/man3/XShapeCombineMask.3x*
-%{_mandir}/man3/XShapeCombineRectangles.3x*
-%{_mandir}/man3/XShapeCombineRegion.3x*
-%{_mandir}/man3/XShapeCombineShape.3x*
-%{_mandir}/man3/XShapeGetRectangles.3x*
-%{_mandir}/man3/XShapeInputSelected.3x*
-%{_mandir}/man3/XShapeOffsetShape.3x*
-%{_mandir}/man3/XShapeQueryExtension.3x*
-%{_mandir}/man3/XShapeQueryExtents.3x*
-%{_mandir}/man3/XShapeQueryVersion.3x*
-%{_mandir}/man3/XShapeSelectInput.3x*
-%{_mandir}/man3/XcupGetReservedColormapEntries.3x*
-%{_mandir}/man3/XcupQueryVersion.3x*
-%{_mandir}/man3/XcupStoreColors.3x*
-%{_mandir}/man3/XdbeAllocateBackBufferName.3x*
-%{_mandir}/man3/XdbeBeginIdiom.3x*
-%{_mandir}/man3/XdbeDeallocateBackBufferName.3x*
-%{_mandir}/man3/XdbeEndIdiom.3x*
-%{_mandir}/man3/XdbeFreeVisualInfo.3x*
-%{_mandir}/man3/XdbeGetBackBufferAttributes.3x*
-%{_mandir}/man3/XdbeGetVisualInfo.3x*
-%{_mandir}/man3/XdbeQueryExtension.3x*
-%{_mandir}/man3/XdbeSwapBuffers.3x*
-%{_mandir}/man3/Xevi.3x*
-%{_mandir}/man3/XeviGetVisualInfo.3x*
-%{_mandir}/man3/XeviQueryExtension.3x*
-%{_mandir}/man3/XeviQueryVersion.3x*
-%{_mandir}/man3/Xmbuf.3x*
-%{_mandir}/man3/XmbufChangeBufferAttributes.3x*
-%{_mandir}/man3/XmbufChangeWindowAttributes.3x*
-%{_mandir}/man3/XmbufCreateBuffers.3x*
-%{_mandir}/man3/XmbufCreateStereoWindow.3x*
-%{_mandir}/man3/XmbufDestroyBuffers.3x*
-%{_mandir}/man3/XmbufDisplayBuffers.3x*
-%{_mandir}/man3/XmbufGetBufferAttributes.3x*
-%{_mandir}/man3/XmbufGetScreenInfo.3x*
-%{_mandir}/man3/XmbufGetVersion.3x*
-%{_mandir}/man3/XmbufGetWindowAttributes.3x*
-%{_mandir}/man3/XmbufQueryExtension.3x*
+#%dir %{_mandir}/man3x
+%{_mandir}/man3/*.3x*
 
 %changelog
+* Wed Jun 07 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-2
+- Replace "makeinstall" with "make install DESTDIR=..."
+- Remove package ownership of mandir/libdir/etc.
+
 * Thu Apr 27 2006 Adam Jackson <ajackson@redhat.com> 1.0.1-1
 - Update to 1.0.1