diff --git a/.cvsignore b/.cvsignore
index 8cba3a7..048063e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-authconfig-5.4.6.tar.bz2
+authconfig-5.4.7.tar.bz2
diff --git a/authconfig.spec b/authconfig.spec
index c7a5e8a..ec31b8c 100644
--- a/authconfig.spec
+++ b/authconfig.spec
@@ -1,6 +1,6 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
-Version: 5.4.6
+Version: 5.4.7
 Release: 1%{?dist}
 License: GPLv2+
 ExclusiveOS: Linux
@@ -8,7 +8,7 @@ Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: https://fedorahosted.org/authconfig
 Source: https://fedorahosted.org/releases/a/u/%{name}/%{name}-%{version}.tar.bz2
-Requires: newt-python, pam >= 0.99.10.0, usermode, python
+Requires: newt-python, pam >= 0.99.10.0, python
 Conflicts: pam_krb5 < 1.49, samba-common < 3.0, samba-client < 3.0
 Conflicts: nss_ldap < 254
 BuildRequires: glib2-devel, python >= 2.4.1, python-devel
@@ -59,8 +59,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING NOTES TODO README.samba3
 %ghost %config(noreplace) %{_sysconfdir}/sysconfig/authconfig
 %ghost %config(noreplace) %{_sysconfdir}/pam.d/system-auth-ac
-%{_bindir}/authconfig
-%{_bindir}/authconfig-tui
 %{_sbindir}/cacertdir_rehash
 %{_sbindir}/authconfig
 %{_sbindir}/authconfig-tui
@@ -73,14 +71,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/authinfo.py*
 %{_datadir}/%{name}/shvfile.py*
 %{_datadir}/%{name}/dnsclient.py*
-%config(noreplace) %{_sysconfdir}/pam.d/authconfig
-%config(noreplace) %{_sysconfdir}/pam.d/authconfig-tui
-%config(noreplace) %{_sysconfdir}/security/console.apps/authconfig
-%config(noreplace) %{_sysconfdir}/security/console.apps/authconfig-tui
 %attr(700,root,root) %dir %{_localstatedir}/lib/%{name}
 
 %files gtk
 %defattr(-,root,root,-)
+%{_bindir}/authconfig
+%{_bindir}/authconfig-tui
 %{_bindir}/authconfig-gtk
 %{_bindir}/system-config-authentication
 %{_sbindir}/authconfig-gtk
@@ -91,10 +87,19 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/pam.d/system-config-authentication
 %config(noreplace) %{_sysconfdir}/security/console.apps/authconfig-gtk
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-authentication
+%config(noreplace) %{_sysconfdir}/pam.d/authconfig
+%config(noreplace) %{_sysconfdir}/pam.d/authconfig-tui
+%config(noreplace) %{_sysconfdir}/security/console.apps/authconfig
+%config(noreplace) %{_sysconfdir}/security/console.apps/authconfig-tui
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
 
 %changelog
+* Mon Jan 26 2009 Tomas Mraz <tmraz@redhat.com> - 5.4.7-1
+- move the consolehelper symlinks to the gtk subpackage to remove
+  the dependency on usermode in the base package (#480014)
+- return nonzero exit codes on some more possible errors (#440461)
+
 * Fri Dec 19 2008 Tomas Mraz <tmraz@redhat.com> - 5.4.6-1
 - fix typo in the fingerprint reader patch (#477080)
 
diff --git a/sources b/sources
index 81fac93..bde140c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-06e0feb9565ded2d9c64cabe356c3639  authconfig-5.4.6.tar.bz2
+f4dd25f64c7174f88149b17139c602b3  authconfig-5.4.7.tar.bz2