diff --git a/.cvsignore b/.cvsignore
index d36e844..16ca158 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-usermode-1.67.tar.gz
+usermode-1.69-1.tar.gz
diff --git a/sources b/sources
index 9a5d39d..f6d16b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-36763e2fcac643af9a7f61cedc3e9e75  usermode-1.67.tar.gz
+ce40aa888460625184e432b67e3591e4  usermode-1.69-1.tar.gz
diff --git a/usermode.spec b/usermode.spec
index fd61fa4..1524e6c 100644
--- a/usermode.spec
+++ b/usermode.spec
@@ -1,11 +1,15 @@
+%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
+%define WITH_SELINUX 0
+%endif
+
 %define build6x 0
 Summary: Tools for certain user account management tasks.
 Name: usermode
-Version: 1.67
-Release: 2
+Version: 1.69
+Release: 1
 License: GPL
 Group: Applications/System
-Source: usermode-%{version}.tar.gz
+Source: usermode-%{version}-%{release}.tar.gz
 %if %{build6x}
 Requires: util-linux, pam >= 0.66-5
 %else
@@ -37,10 +41,14 @@ Install the usermode-gtk package if you would like to provide users with
 graphical tools for certain account management tasks.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-%{release}
 
 %build
-%configure
+%configure \
+%if %{WITH_SELINUX}
+	--with-selinux 
+%endif
+
 make
 
 %install
@@ -59,7 +67,9 @@ for wrappedapp in halt reboot poweroff ; do
 	cp shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
 %endif
 done
-
+%if %{WITH_SELINUX}
+install -m644 userhelper_context $RPM_BUILD_ROOT/etc/security
+%endif
 %if ! %{build6x}
 rm -f $RPM_BUILD_ROOT/%{_bindir}/shutdown
 %endif
@@ -88,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 %config /etc/security/console.apps/halt
 %config /etc/security/console.apps/reboot
 %config /etc/security/console.apps/poweroff
+%if %{WITH_SELINUX}
+%config /etc/security/userhelper_context
+%endif
 
 %files gtk
 %defattr(-,root,root)
@@ -104,6 +117,40 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
+* Thu Oct 23 2003 Nalin Dahyabhai <nalin@redhat.com> 1.69-1
+- all around: cleanups
+- consolehelper: coalesce multiple messages from PAM again
+- usermount: handle user-not-allowed-to-control-mounts error correctly (#100457)
+- userhelper: trim off terminating commas when changing chfn info
+
+* Mon Oct 6 2003 Dan Walsh <dwalsh@redhat.com> 1.68-8
+
+* Wed Oct 1 2003 Dan Walsh <dwalsh@redhat.com> 1.68-7.sel
+- Fix to use /etc instead of /usr/etc
+
+* Thu Sep 25 2003 Dan Walsh <dwalsh@redhat.com> 1.68-6.sel
+- turn on selinux
+- add default userhelper context file
+
+* Thu Sep 25 2003 Nalin Dahyabhai <nalin@redhat.com> 1.68-6
+- make selinux a configure option to avoid screwing with makefiles
+
+* Thu Sep 25 2003 Nalin Dahyabhai <nalin@redhat.com> 1.68-5
+- rebuild
+
+* Mon Sep 8 2003 Dan Walsh <dwalsh@redhat.com> 1.68-4
+- turn off selinux
+
+* Fri Sep 5 2003 Dan Walsh <dwalsh@redhat.com> 1.68-3.sel
+- turn on selinux
+
+* Tue Jul 29 2003 Dan Walsh <dwalsh@redhat.com> 1.68-2
+- Add SELinux support
+
+* Wed Apr 16 2003 Nalin Dahyabhai <nalin@redhat.com> 1.68-1
+- update translations
+- suppress the error dialog from user cancel
+
 * Mon Feb 24 2003 Elliot Lee <sopwith@redhat.com>
 - rebuilt