diff --git a/.cvsignore b/.cvsignore
index 1858f62..1fb9752 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libXScrnSaver-0.99.2.tar.bz2
+libXScrnSaver-0.99.3.tar.bz2
diff --git a/libXScrnSaver.spec b/libXScrnSaver.spec
index a9c8e4d..f610c14 100644
--- a/libXScrnSaver.spec
+++ b/libXScrnSaver.spec
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXss runtime library
 Name: libXScrnSaver
-Version: 0.99.2
-Release: 4.1
+Version: 0.99.3
+Release: 1
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -22,6 +22,7 @@ X.Org X11 libXss runtime library
 Summary: X.Org X11 libXScrnSaver development package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
@@ -72,10 +73,16 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xscrnsaver.pc
 %dir %{_mandir}
-%dir %{_mandir}/man3x
-%{_mandir}/man3x/*.3x*
+%dir %{_mandir}/man3
+%{_mandir}/man3/*.3x*
 
 %changelog
+* Tue Dec 13 2005 Mike A. Harris <mharris@redhat.com> 0.99.3-1
+- Updated libXScrnSaver 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
 
@@ -83,7 +90,6 @@ rm -rf $RPM_BUILD_ROOT
 - Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes'
 - Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes'
 
-
 * Wed Nov 2 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-3
 - Actually spell RPM_OPT_FLAGS correctly this time.
 
@@ -95,12 +101,12 @@ rm -rf $RPM_BUILD_ROOT
 - Updated libXScrnSaver to version 0.99.2 from X11R7 RC1
 - Updated file manifest to find manpages in "man3x"
 
-* Mon Oct  3 2005 Mike A. Harris <mharris.com> 0.99.1-1
+* Mon Oct  3 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-1
 - Updated to new upstream libXScrnSaver-0.99.1 which changes the .so name back
   to libXss, but keeps the inconsistent package name.  This may change again
   in the future.
 
-* Thu Sep 29 2005 Mike A. Harris <mharris.com> 0.99.0-3
+* Thu Sep 29 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-3
 - Renamed package to remove xorg-x11 from the name due to unanimous decision
   between developers.
 - Use Fedora Extras style BuildRoot tag.
diff --git a/sources b/sources
index 7fc4bc2..2d6ae6b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-42a224d1e4641ca3eed3a0ab52894517  libXScrnSaver-0.99.2.tar.bz2
+2c1477c90f3fdca4363ad792047dfdcd  libXScrnSaver-0.99.3.tar.bz2