diff --git a/.cvsignore b/.cvsignore
index e032ba2..e6367a5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-usermode-1.87.tar.gz
+usermode-1.89.tar.bz2
diff --git a/sources b/sources
index 4bed37d..6bd7c20 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db4305b30115ebdfcd650babc370e03f  usermode-1.87.tar.gz
+ccf617683a487e4ec27faaa3c343242d  usermode-1.89.tar.bz2
diff --git a/usermode.spec b/usermode.spec
index 3379c89..387c705 100644
--- a/usermode.spec
+++ b/usermode.spec
@@ -2,30 +2,25 @@
 %define WITH_SELINUX 1
 %endif
 
-%define build6x 0
-Summary: Tools for certain user account management tasks.
+Summary: Tools for certain user account management tasks
 Name: usermode
-Version: 1.87
-Release: 3
+Version: 1.89
+Release: 1
 License: GPL
 Group: Applications/System
-Source: usermode-%{version}.tar.gz
-%if %{build6x}
-Requires: util-linux, pam >= 0.66-5
-%else
+Source: usermode-%{version}.tar.bz2
 Requires: util-linux, pam >= 0.75-37, /etc/pam.d/system-auth, passwd
-%endif
 Conflicts: SysVinit < 2.74-14
-BuildPrereq: desktop-file-utils, glib2-devel, gtk2-devel
-BuildPrereq: libglade2-devel, libuser-devel, pam-devel, util-linux
-BuildPrereq: perl-XML-Parser, libattr-devel, libSM-devel, gettext
+BuildRequires: desktop-file-utils, glib2-devel, gtk2-devel
+BuildRequires: libglade2-devel, libuser-devel, pam-devel, util-linux
+BuildRequires: perl-XML-Parser, libattr-devel, libSM-devel, gettext
 %if %{WITH_SELINUX}
-BuildPrereq: libselinux-devel >= 1.17.13-2
+BuildRequires: libselinux-devel >= 1.17.13-2
 %endif
 BuildRoot: %{_tmppath}/%{name}-root
 
 %package gtk
-Summary: Graphical tools for certain user account management tasks.
+Summary: Graphical tools for certain user account management tasks
 Group: Applications/System
 Requires: %{name} = %{version}-%{release}
 
@@ -48,10 +43,9 @@ graphical tools for certain account management tasks.
 %setup -q
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
 %configure \
 %if %{WITH_SELINUX}
-	--with-selinux 
+	--with-selinux
 %endif
 
 make
@@ -69,15 +63,8 @@ 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}
 	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}
-rm -f $RPM_BUILD_ROOT/%{_bindir}/shutdown
-%endif
 
 %find_lang %{name}
 
@@ -94,9 +81,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/halt
 %{_bindir}/reboot
 %{_bindir}/poweroff
-%if %{build6x}
-%{_bindir}/shutdown
-%endif
+%exclude %{_bindir}/shutdown
 %config(noreplace) /etc/pam.d/halt
 %config(noreplace) /etc/pam.d/reboot
 %config(noreplace) /etc/pam.d/poweroff
@@ -120,6 +105,24 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
+* Fri Mar  9 2007 Miloslav Trmac <mitr@redhat.com> - 1.89-1
+- Preserve application exit code in consolehelper
+  Resolves: #178991, #210893
+- Drop the historical build6x spec file variable
+- Fix some rpmlint warnings
+
+* Mon Dec 11 2006 Martin Bacovsky <mbacovsk@redhat.com> - 1.88-3.el5
+- Updated translations
+- Resolves: #216622
+
+* Fri Dec  1 2006 Martin Bacovsky <mbacovsk@redhat.com> - 1.88-2.el5
+- Updated translations
+- Resolves: #216622
+
+* Thu Nov 30 2006 Martin Bacovsky <mbacovsk@redhat.com> - 1.88-1.el5
+- Updated translations
+- Resolves: #216622
+
 * Tue Oct  3 2006 Martin Bacovsky <mbacovsky@redhat.com> 1.87-3
 - Repackaging with new translations
 
@@ -517,7 +520,7 @@ rm -rf $RPM_BUILD_ROOT
 - only try to call gtk_main_quit() if we've got a loop to get out of (#54109)
 - obey RPM_OPT_FLAGS, obey
 
-* Tue Aug 28 2001 Trond Eivind Glomsrød <teg@redhat.com> 1.43-1
+* Tue Aug 28 2001 Trond Eivind Glomsrød <teg@redhat.com> 1.43-1
 - Update translations
 
 * Mon Aug  6 2001 Nalin Dahyabhai <nalin@redhat.com>