diff --git a/.cvsignore b/.cvsignore
index db7f2be..f637c26 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libXext-0.99.2.tar.bz2
+libXext-0.99.3.tar.bz2
diff --git a/libXext.spec b/libXext.spec
index f643c8f..f313891 100644
--- a/libXext.spec
+++ b/libXext.spec
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXext runtime library
 Name: libXext
-Version: 0.99.2
-Release: 1.1
+Version: 0.99.3
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -21,6 +21,7 @@ X.Org X11 libXext runtime library
 Summary: X.Org X11 libXext development package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -71,60 +72,66 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xext.pc
 %dir %{_mandir}
-%dir %{_mandir}/man3x
+%dir %{_mandir}/man3
 # NOTE: manpages listed individually so that rpm detects if any go missing
-%{_mandir}/man3x/DBE.3x*
-%{_mandir}/man3x/DPMSCapable.3x*
-%{_mandir}/man3x/DPMSDisable.3x*
-%{_mandir}/man3x/DPMSEnable.3x*
-%{_mandir}/man3x/DPMSForceLevel.3x*
-%{_mandir}/man3x/DPMSGetTimeouts.3x*
-%{_mandir}/man3x/DPMSGetVersion.3x*
-%{_mandir}/man3x/DPMSInfo.3x*
-%{_mandir}/man3x/DPMSQueryExtension.3x*
-%{_mandir}/man3x/DPMSSetTimeouts.3x*
-%{_mandir}/man3x/XShape.3x*
-%{_mandir}/man3x/XShapeCombineMask.3x*
-%{_mandir}/man3x/XShapeCombineRectangles.3x*
-%{_mandir}/man3x/XShapeCombineRegion.3x*
-%{_mandir}/man3x/XShapeCombineShape.3x*
-%{_mandir}/man3x/XShapeGetRectangles.3x*
-%{_mandir}/man3x/XShapeInputSelected.3x*
-%{_mandir}/man3x/XShapeOffsetShape.3x*
-%{_mandir}/man3x/XShapeQueryExtension.3x*
-%{_mandir}/man3x/XShapeQueryExtents.3x*
-%{_mandir}/man3x/XShapeQueryVersion.3x*
-%{_mandir}/man3x/XShapeSelectInput.3x*
-%{_mandir}/man3x/XcupGetReservedColormapEntries.3x*
-%{_mandir}/man3x/XcupQueryVersion.3x*
-%{_mandir}/man3x/XcupStoreColors.3x*
-%{_mandir}/man3x/XdbeAllocateBackBufferName.3x*
-%{_mandir}/man3x/XdbeBeginIdiom.3x*
-%{_mandir}/man3x/XdbeDeallocateBackBufferName.3x*
-%{_mandir}/man3x/XdbeEndIdiom.3x*
-%{_mandir}/man3x/XdbeFreeVisualInfo.3x*
-%{_mandir}/man3x/XdbeGetBackBufferAttributes.3x*
-%{_mandir}/man3x/XdbeGetVisualInfo.3x*
-%{_mandir}/man3x/XdbeQueryExtension.3x*
-%{_mandir}/man3x/XdbeSwapBuffers.3x*
-%{_mandir}/man3x/Xevi.3x*
-%{_mandir}/man3x/XeviGetVisualInfo.3x*
-%{_mandir}/man3x/XeviQueryExtension.3x*
-%{_mandir}/man3x/XeviQueryVersion.3x*
-%{_mandir}/man3x/Xmbuf.3x*
-%{_mandir}/man3x/XmbufChangeBufferAttributes.3x*
-%{_mandir}/man3x/XmbufChangeWindowAttributes.3x*
-%{_mandir}/man3x/XmbufCreateBuffers.3x*
-%{_mandir}/man3x/XmbufCreateStereoWindow.3x*
-%{_mandir}/man3x/XmbufDestroyBuffers.3x*
-%{_mandir}/man3x/XmbufDisplayBuffers.3x*
-%{_mandir}/man3x/XmbufGetBufferAttributes.3x*
-%{_mandir}/man3x/XmbufGetScreenInfo.3x*
-%{_mandir}/man3x/XmbufGetVersion.3x*
-%{_mandir}/man3x/XmbufGetWindowAttributes.3x*
-%{_mandir}/man3x/XmbufQueryExtension.3x*
+%{_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*
 
 %changelog
+* Tue Dec 13 2005 Mike A. Harris <mharris@redhat.com> 0.99.3-1
+- Updated libXext to version 0.99.3 from X11R7 RC3
+- Added "Requires(pre): xorg-x11-filesystem >= 0.99.2-3", to ensure
+  that /usr/lib/X11 and /usr/include/X11 pre-exist.
+- Removed 'x' suffix from manpage directories to match RC3 upstream.
+
 * Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
 - rebuilt
 
diff --git a/sources b/sources
index b99ea11..a270b9f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-03cfe5664067312b9b398891e40deb46  libXext-0.99.2.tar.bz2
+9d9cf469ecea874853aeabc301e91221  libXext-0.99.3.tar.bz2