diff --git a/.cvsignore b/.cvsignore
index 2cd3d5b..ccbcb2c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libXp-0.99.1.tar.bz2
+libXp-0.99.2.tar.bz2
diff --git a/libXp.spec b/libXp.spec
index 3e75b18..6c422ea 100644
--- a/libXp.spec
+++ b/libXp.spec
@@ -2,8 +2,8 @@
 
 Summary: X.Org X11 libXp runtime library
 Name: libXp
-Version: 0.99.1
-Release: 3.1
+Version: 0.99.2
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -11,6 +11,7 @@ Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{name}-%{version}.t
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: pkgconfig
+BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
@@ -26,6 +27,7 @@ X.Org X11 libXp runtime library
 Summary: X.Org X11 libXp development package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 
 Obsoletes: XFree86-devel, xorg-x11-devel, xorg-x11-deprecated-libs-devel
 
@@ -91,11 +93,17 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xp.pc
 #%dir %{_mandir}
-#%dir %{_mandir}/man3x
-#%{_mandir}/man3x/*.3x*
+#%dir %{_mandir}/man3
+#%{_mandir}/man3/*.3x*
 %endif
 
 %changelog
+* Tue Dec 13 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-1
+- Updated libXp to version 0.99.2 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 fde7fcf..f5ea88e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8455bf5abe4496a8fb4a1c8d11d5cbf9  libXp-0.99.1.tar.bz2
+f49b4dcdf782601e91945d3d1605d4be  libXp-0.99.2.tar.bz2