diff --git a/.cvsignore b/.cvsignore
index 2f4389b..c3e2416 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-usermode-1.35.tar.bz2
+usermode-1.36.tar.bz2
diff --git a/sources b/sources
index 8fddd73..ea927a0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b4d2030313b42cee7d340957f12d75ca  usermode-1.35.tar.bz2
+8cefd99346832c82fb12d8fdee50fa74  usermode-1.36.tar.bz2
diff --git a/usermode.spec b/usermode.spec
index cf90fba..340e2b5 100644
--- a/usermode.spec
+++ b/usermode.spec
@@ -1,8 +1,8 @@
 %define build6x 0
 Summary: Graphical tools for certain user account management tasks.
 Name: usermode
-Version: 1.35
-Release: 2
+Version: 1.36
+Release: 3
 Copyright: GPL
 Group: Applications/System
 Source: usermode-%{PACKAGE_VERSION}.tar.bz2
@@ -77,7 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/halt
 %{_bindir}/reboot
 %{_bindir}/poweroff
+%if %{build6x}
 %{_bindir}/shutdown
+%endif
 %{_datadir}/pixmaps/*
 %{_datadir}/locale/*/*/*
 %config(noreplace) /etc/pam.d/halt
@@ -88,6 +90,21 @@ rm -rf $RPM_BUILD_ROOT
 %config(missingok) /etc/security/console.apps/poweroff
 
 %changelog
+* Fri Oct  6 2000 Nalin Dahyabhai <nalin@redhat.com>
+- don't pass on arguments to halt and reboot, because they error out
+
+* Thu Oct  5 2000 Nalin Dahyabhai <nalin@redhat.com>
+- fix the /usr/bin/shutdown wrapper so that root can call shutdown
+- only include the /usr/bin/shutdown wrapper on 6.x
+- also sanitize LC_MESSAGES
+- tweak sanitizing checks (from mkj)
+
+* Wed Oct  4 2000 Jakub Jelinek <jakub@redhat.com>
+- fix a security bug with LC_ALL/LANG variables (#18046)
+
+* Mon Aug 28 2000 Nalin Dahyabhai <nalin@redhat.com>
+- mark defined strings translateable (#17006)
+
 * Thu Aug 24 2000 Nalin Dahyabhai <nalin@redhat.com>
 - fix incorrect user name
 - add a shell wrapper version of /usr/bin/shutdown