diff --git a/.cvsignore b/.cvsignore
index 185a151..5ad8b4b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-usermode-1.53.tar.gz
+usermode-1.59.tar.gz
diff --git a/sources b/sources
index fa93700..52d07be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4510849ea395cb2f87ec79ccb30e21b5  usermode-1.53.tar.gz
+d0212538372c68d56e4abdb35030242f  usermode-1.59.tar.gz
diff --git a/usermode.spec b/usermode.spec
index 54a455a..bb1b7d7 100644
--- a/usermode.spec
+++ b/usermode.spec
@@ -1,7 +1,7 @@
 %define build6x 0
 Summary: Tools for certain user account management tasks.
 Name: usermode
-Version: 1.53
+Version: 1.59
 Release: 2
 License: GPL
 Group: Applications/System
@@ -9,10 +9,11 @@ Source: usermode-%{version}.tar.gz
 %if %{build6x}
 Requires: util-linux, pam >= 0.66-5
 %else
-Requires: util-linux, pam >= 0.66-5, /etc/pam.d/system-auth
+Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth
 %endif
 Conflicts: SysVinit < 2.74-14
-BuildPrereq: glib2-devel, gtk2-devel, libglade2-devel, libuser-devel, pam-devel, util-linux
+BuildPrereq: desktop-file-utils, glib2-devel, gtk2-devel
+BuildPrereq: libglade2-devel, libuser-devel, pam-devel, util-linux
 BuildRoot: %{_tmppath}/%{name}-root
 
 %package gtk
@@ -51,16 +52,19 @@ make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d $RPM_BUILD_ROOT/etc/security/console.apps
 for wrappedapp in halt reboot poweroff ; do
 	ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/${wrappedapp}
-	touch $RPM_BUILD_ROOT/etc/security/console.apps/${wrappedapp}
+	install -m644 $wrappedapp $RPM_BUILD_ROOT/etc/security/console.apps/${wrappedapp}
 %if %{build6x}
 	cp shutdown.pamd.6x $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
 %else
 	cp shutdown.pamd $RPM_BUILD_ROOT/etc/pam.d/${wrappedapp}
 %endif
 done
+%if ! %{build6x}
+install -m644 pam_timestamp_init.console $RPM_BUILD_ROOT/etc/security/console.apps/pam_timestamp_init
+install -m644 pam_timestamp_init.pamd    $RPM_BUILD_ROOT/etc/pam.d/pam_timestamp_init
+ln -sf consolehelper $RPM_BUILD_ROOT/%{_bindir}/pam_timestamp_init
+%endif
 
-# Strip it!  Strip it good!
-strip $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_sbindir}/* || :
 %find_lang %{name}
 
 %clean
@@ -88,7 +92,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files gtk
 %defattr(-,root,root)
-%config /etc/X11/applnk/System/*
 %{_bindir}/usermount
 %{_mandir}/man1/usermount.1*
 %{_bindir}/userinfo
@@ -96,12 +99,64 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/userpasswd
 %{_mandir}/man1/userpasswd.1*
 %{_bindir}/consolehelper-gtk
+%{_bindir}/pam-panel-icon
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/*
+%{_datadir}/applications/*
 
 # If you're updating translations, do me a favor and bump the RELEASE number,
 # and not the VERSION number.  Version numbers indicate CODE changes.
 %changelog
+* Wed Aug 14 2002 Nalin Dahyabhai <nalin@redhat.com> 1.59-2
+- change "forget password" to "forget authorization", because we don't actually
+  remember the password (that would be scary, #71476)
+
+* Tue Aug 13 2002 Nalin Dahyabhai <nalin@redhat.com> 1.59-1
+- pam-panel-icon: overhaul, change the 'locked' icon to keyring-small, nix the
+  'unlocked' icon
+- consolehelper-gtk: properly set up the dialog buttons (should be 'cancel/ok'
+  when we're asking questions, was always 'close')
+- disappear pam_timestamp_init
+
+* Wed Aug  7 2002 Nalin Dahyabhai <nalin@redhat.com> 1.58-2
+- install the new 'unlocked' icon
+
+* Tue Aug  6 2002 Jonathan Blandford <jrb@redhat.com>
+- New version.
+
+* Mon Aug  5 2002 Nalin Dahyabhai <nalin@redhat.com> 1.57-1
+- add support for BANNER and BANNER_DOMAIN in the userhelper configuration
+
+* Mon Aug  5 2002 Nalin Dahyabhai <nalin@redhat.com> 1.56-4
+- mark strings in the .glade file as translatable (#70278)
+- translation updates
+
+* Wed Jul 31 2002 Nalin Dahyabhai <nalin@redhat.com> 1.56-3
+- add icons for userpasswd and usermount
+
+* Wed Jul 24 2002 Nalin Dahyabhai <nalin@redhat.com> 1.56-2
+- actually include the icons
+- translation updates
+
+* Tue Jul 23 2002 Nalin Dahyabhai <nalin@redhat.com> 1.56-1
+- userinfo: prevent users from selecting "nologin" as a shell (#68579)
+- don't strip binaries by default; leave that to the buildroot policy
+- use desktop-file-install
+
+* Wed Jun 19 2002 Havoc Pennington <hp@redhat.com>
+- put pam-panel-icon in file list
+
+* Mon May 20 2002 Nalin Dahyabhai <nalin@redhat.com> 1.55-2
+- don't strip binaries which have no special privileges
+
+* Wed May 15 2002 Nalin Dahyabhai <nalin@redhat.com> 1.55-1
+- remove the pixmap we don't use any more (we use stock pixmaps now)
+- update translations
+
+* Thu Apr 16 2002 Nalin Dahyabhai <nalin@redhat.com> 1.54-1
+- suppress even error messages from Xlib when consolehelper calls
+  gtk_init_check() to see if the display is available
+
 * Mon Apr 15 2002 Nalin Dahyabhai <nalin@redhat.com> 1.53-2
 - refresh translations