diff --git a/.cvsignore b/.cvsignore
index 9cd06bb..2b4d0b8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-authconfig-5.3.20.tar.bz2
+authconfig-5.4.0.tar.bz2
diff --git a/authconfig.spec b/authconfig.spec
index eb90062..71ae36d 100644
--- a/authconfig.spec
+++ b/authconfig.spec
@@ -1,18 +1,14 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
-Version: 5.3.20
-# Don't change release in elvis CVS, up version after merging all patches
-# from dist CVS instead.
-Release: 2%{?dist}
+Version: 5.4.0
+Release: 1%{?dist}
 License: GPLv2+
 ExclusiveOS: Linux
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# The upstream project is hosted in CVS on:
-URL: http://rhlinux.redhat.com/
-# The project doesn't have http site with downloadable tarballs yet.
-Source: %{name}-%{version}.tar.bz2
-Requires: newt-python, pam >= 0.99.8.1-14, usermode, python
+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
 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
@@ -81,6 +77,7 @@ rm -rf $RPM_BUILD_ROOT
 %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}/%{name}
 
 %files gtk
 %defattr(-,root,root,-)
@@ -98,8 +95,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/*
 
 %changelog
-* Wed Feb 20 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 5.3.20-2
-- Autorebuild for GCC 4.3
+* Mon Mar 10 2008 Tomas Mraz <tmraz@redhat.com> - 5.4.0-1
+- include config-util in console.apps files
+- add support for saving/restoring backups of configuration
+  files affected by authconfig (#433776)
+- improve the authconfig manual page (#432023, #432938)
+
+* Tue Jan 29 2008 Tomas Mraz <tmraz@redhat.com> - 5.3.21-1
+- correct the fix for bug #237956
 
 * Fri Jan 18 2008 Tomas Mraz <tmraz@redhat.com> - 5.3.20-1
 - update translations
diff --git a/sources b/sources
index bb6661e..4cffc8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f0187a868b30b5dd66b78c2e07d247d4  authconfig-5.3.20.tar.bz2
+0acddc0eabcd5fc6bb4c471b8058f0de  authconfig-5.4.0.tar.bz2