diff --git a/xorg-x11-xsm.spec b/xorg-x11-xsm.spec
index 48b42d9..4999dfc 100644
--- a/xorg-x11-xsm.spec
+++ b/xorg-x11-xsm.spec
@@ -3,30 +3,39 @@
 Summary: X.Org X11 X Session Manager
 Name: xorg-x11-%{pkgname}
 Version: 0.99.2
-Release: 3
+Release: 4
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
-%define xorgurl http://xorg.freedesktop.org/releases/X11R7.0-RC2/everything
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC2/everything/xsm-0.99.2.tar.bz2
 Source1: http://xorg.freedesktop.org/releases/X11R7.0-RC2/everything/smproxy-0.99.1.tar.bz2
 Source2: http://xorg.freedesktop.org/releases/X11R7.0-RC2/everything/rstart-0.99.1.tar.bz2
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Patches for xsm (10-19)
+Patch10: xsm-0.99.2-xsm-installation-location-fixes.patch
+
+# Patches for smproxy (20-29)
+#Patch20:
+
+# Patches for rstart (30-39)
+Patch30: rstart-0.99.1-rstart-installation-location-fixes.patch
 
 # FIXME: The BuildRequires are all missing here and need to be figured out.
 # That's low priority for now though, unless we encounter real build
 # failures in beehive.
-
 BuildRequires: pkgconfig
 
 # libxkbfile-devel needed for setxkbmap, xkbcomp, xkbevd, xkbprint
 #BuildRequires: libxkbfile-devel
 
-# FIXME: check if still needed for X11R7
-Requires(pre): filesystem >= 2.3.6-1
+# NOTE: xorg-x11-filesystem >= 0.99.2-3 is required for OS upgrades from
+# monolithic X releases to modular X releases to work properly.
+Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+# rstart script invokes xauth, rsh
+Requires: xauth, rsh
 
-Provides: xsm, smproxy, rstart
+Provides: xsm, smproxy, rstart, rstartd
 
 # NOTE: xsm, smproxy, rstart used to be part of the XFree86/xorg-x11 package
 Obsoletes: XFree86, xorg-x11
@@ -36,12 +45,23 @@ X.Org X11 X Session Manager
 
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2
+%patch10 -p0 -b .xsm-installation-location-fixes
+%patch30 -p0 -b .rstart-installation-location-fixes
 
 %build
 # Build everything
 {
    for pkg in xsm smproxy rstart ; do
       pushd $pkg-*
+
+      case $pkg in
+         # FIXME: Required for rstart-0.99.1-installation-location-fixes.patch
+         #        and xsm-0.99.2-xsm-installation-location-fixes.patch
+         xsm|rstart)
+            aclocal ; automake ; autoconf
+            ;;
+      esac
+
       %configure
       make
       popd
@@ -71,33 +91,45 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/rstartd
 %{_bindir}/smproxy
 %{_bindir}/xsm
+%dir %{_datadir}/X11
+%dir %{_datadir}/X11/rstart
+%dir %{_datadir}/X11/rstart/commands
+%{_datadir}/X11/rstart/commands/@List
+%{_datadir}/X11/rstart/commands/ListContexts
+%{_datadir}/X11/rstart/commands/ListGenericCommands
+%{_datadir}/X11/rstart/commands/x11r6/@List
+%{_datadir}/X11/rstart/commands/x11r6/LoadMonitor
+%{_datadir}/X11/rstart/commands/x11r6/Terminal
+%{_datadir}/X11/rstart/contexts/@List
+%{_datadir}/X11/rstart/contexts/default
+%{_datadir}/X11/rstart/contexts/x11r6
+%dir %{_datadir}/X11/app-defaults
+%{_datadir}/X11/app-defaults/XSm
 %dir %{_libdir}/X11
-%dir %{_libdir}/X11/app-defaults
-%{_libdir}/X11/app-defaults/XSm
-%dir %{_libdir}/X11/rstart/commands
-%{_libdir}/X11/rstart/commands/@List
-%{_libdir}/X11/rstart/commands/ListContexts
-%{_libdir}/X11/rstart/commands/ListGenericCommands
-%dir %{_libdir}/X11/rstart/commands/x11r6
-%{_libdir}/X11/rstart/commands/x11r6/@List
-%{_libdir}/X11/rstart/commands/x11r6/LoadMonitor
-%{_libdir}/X11/rstart/commands/x11r6/Terminal
-%{_libdir}/X11/rstart/config
-%dir %{_libdir}/X11/rstart/contexts
-%{_libdir}/X11/rstart/contexts/@List
-%{_libdir}/X11/rstart/contexts/default
-%{_libdir}/X11/rstart/contexts/x11r6
+%dir %{_libdir}/X11/rstart
+# NOTE: This binary can and probably should sit in /usr/sbin, but oh well.
 %{_libdir}/X11/rstart/rstartd.real
-%dir %{_libdir}/X11/xsm
-%{_libdir}/X11/xsm/system.xsm
 %dir %{_mandir}
 %dir %{_mandir}/man1x
 %{_mandir}/man1x/rstart.1x*
 %{_mandir}/man1x/rstartd.1x*
 %{_mandir}/man1x/smproxy.1x*
 %{_mandir}/man1x/xsm.1x*
+%dir %{_sysconfdir}
+%dir %{_sysconfdir}/X11
+%dir %{_sysconfdir}/X11/rstart
+%config %{_sysconfdir}/X11/rstart/config
+%dir %{_sysconfdir}/X11/xsm
+%config %{_sysconfdir}/X11/xsm/system.xsm
 
 %changelog
+* Tue Nov 22 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-4
+- Add "Requires(pre): xorg-x11-filesystem >= 0.99.2-3" to avoid bug (#173384).
+- Added rstart-0.99.1-rstart-installation-location-fixes.patch and
+  xsm-0.99.2-xsm-installation-location-fixes.patch to put config files in
+ /etc and data files in /usr/share where they belong.
+- Added "Requires: xauth, rsh" as rstart invokes xauth, rsh.
+
 * Mon Nov 14 2005 Jeremy Katz <katzj@redhat.com> - 0.99.2-3
 - require newer filesystem package (#172610)