diff --git a/.gitignore b/.gitignore
index 125bfa8..a2e2bda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@ pam_krb5-2.3.11-1.tar.gz
 /pam_krb5-2.3.13-1.tar.gz
 /pam_krb5-2.3.14-1.tar.gz
 /pam_krb5-2.3.14-1.tar.gz.sig
+/pam_krb5-2.4.0.tar.gz
+/pam_krb5-2.4.0.tar.gz.sig
diff --git a/pam_krb5.spec b/pam_krb5.spec
index 0480104..e6d9f2a 100644
--- a/pam_krb5.spec
+++ b/pam_krb5.spec
@@ -1,9 +1,15 @@
+%if 0%{?fedora} > 16 || 0%{?rhel} > 6
+%global security_parent_dir /%{_libdir}
+%else
+%global security_parent_dir /%{_lib}
+%endif
+
 Summary: A Pluggable Authentication Module for Kerberos 5
 Name: pam_krb5
-Version: 2.3.14
-Release: 3%{?dist}
-Source0: https://fedorahosted.org/released/pam_krb5/pam_krb5-%{version}-1.tar.gz
-Source1: https://fedorahosted.org/released/pam_krb5/pam_krb5-%{version}-1.tar.gz.sig
+Version: 2.4.0
+Release: 1%{?dist}
+Source0: https://fedorahosted.org/released/pam_krb5/pam_krb5-%{version}.tar.gz
+Source1: https://fedorahosted.org/released/pam_krb5/pam_krb5-%{version}.tar.gz.sig
 License: BSD or LGPLv2+
 Group: System Environment/Base
 URL: https://fedorahosted.org/pam_krb5/
@@ -12,20 +18,19 @@ BuildRequires: keyutils-libs-devel, krb5-devel, pam-devel
 # BuildRequires: krb5-server, krb5-workstation
 
 %description 
-This is pam_krb5, a pluggable authentication module that can be used with
-Linux-PAM and Kerberos 5. This module supports password checking, ticket
-creation, and optional TGT verification and conversion to Kerberos IV tickets.
-The included pam_krb5afs module also gets AFS tokens if so configured.
+This is pam_krb5, a pluggable authentication module that can be used by
+PAM-aware applications to check passwords and obtain ticket granting tickets
+using Kerberos 5, and to change user passwords.
 
 %prep
-%setup -q -n pam_krb5-%{version}-1
+%setup -q
 
 %build
 configure_flags=
 %if 0%{?fedora} > 17 || 0%{?rhel} > 6
-configure_flags=--enable-default-ccname-template=FILE:/run/user/%%U/krb5cc_XXXXXX
+configure_flags=--enable-default-ccname-template=DIR:/run/user/%%U/krb5cc_XXXXXX
 %endif
-%configure --libdir=/%{_lib} \
+%configure --libdir=/%{security_parent_dir} \
 	--with-default-use-shmem="sshd" \
 	--with-default-external="sshd sshd-rekey gssftp" \
 	--with-default-multiple-ccaches="su su-l" \
@@ -35,8 +40,8 @@ make %{?_smp_mflags}
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-ln -s pam_krb5.so $RPM_BUILD_ROOT/%{_lib}/security/pam_krb5afs.so
-rm -f $RPM_BUILD_ROOT/%{_lib}/security/*.la
+ln -s pam_krb5.so $RPM_BUILD_ROOT/%{security_parent_dir}/security/pam_krb5afs.so
+rm -f $RPM_BUILD_ROOT/%{security_parent_dir}/security/*.la
 
 # Make the paths jive to avoid conflicts on multilib systems.
 sed -ri -e 's|/lib(64)?/|/\$LIB/|g' $RPM_BUILD_ROOT/%{_mandir}/man*/pam_krb5*.8*
@@ -52,14 +57,48 @@ sed -ri -e 's|/lib(64)?/|/\$LIB/|g' $RPM_BUILD_ROOT/%{_mandir}/man*/pam_krb5*.8*
 %defattr(-,root,root,-)
 %doc README* COPYING* ChangeLog NEWS
 %{_bindir}/*
-/%{_lib}/security/pam_krb5.so
-/%{_lib}/security/pam_krb5afs.so
-/%{_lib}/security/pam_krb5
+%{security_parent_dir}/security/*.so
+%{security_parent_dir}/security/pam_krb5
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %{_mandir}/man8/*
 
 %changelog
+* Mon Sep 10 2012 Nalin Dahyabhai <nalin@redhat.com> - 2.4.0-1
+- update to 2.4.0
+
+* Fri Sep  7 2012 Nalin Dahyabhai <nalin@redhat.com> - 2.3.97-1
+- update to 2.3.97
+  - fix the order of credentials in a user ccache looking wrong
+  - in the ticket manipulation helper, if we're trying to switch IDs and
+    can't, if we should be able to do so, flag an error
+
+* Tue Sep  4 2012 Nalin Dahyabhai <nalin@redhat.com> - 2.3.96-1
+- update to 2.3.96
+  - fix during credential reinitialization when we don't have credentials
+
+* Tue Sep  4 2012 Nalin Dahyabhai <nalin@redhat.com> - 2.3.95-1
+- update to 2.3.95
+  - more tests
+  - fixes for externally-obtained credentials
+
+* Sat Sep  1 2012 Nalin Dahyabhai <nalin@redhat.com> - 2.3.94-1
+- update to 2.3.94
+  - more tests
+
+* Sat Sep  1 2012 Nalin Dahyabhai <nalin@redhat.com> - 2.3.93-1
+- update to 2.3.92
+  - don't try to use an armor ccache if we fail to get an armor ticket
+
+* Thu Aug 30 2012 Nalin Dahyabhai <nalin@redhat.com> - 2.3.92-1
+- update to 2.3.92
+  - armoring options
+
+* Wed Aug 29 2012 Nalin Dahyabhai <nalin@redhat.com> - 2.3.91-1
+- update to 2.3.91
+  - support for DIR: ccaches
+  - proper support for KEYRING: ccaches
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.14-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index fa8288c..e39a45c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e1cdd5555b2c7f733faaedfbf05ef63b  pam_krb5-2.3.14-1.tar.gz
-0619a29f34d7efdebeaf9e2b029aa476  pam_krb5-2.3.14-1.tar.gz.sig
+23321218d91cd02dd359c4b7f49fde4b  pam_krb5-2.4.0.tar.gz
+0b51e12bd1806db09a29d3649866c813  pam_krb5-2.4.0.tar.gz.sig