diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec
index 56286b7..1d67351 100644
--- a/ecryptfs-utils.spec
+++ b/ecryptfs-utils.spec
@@ -1,11 +1,11 @@
 Name: ecryptfs-utils
-Version: 18
-Release: 1%{?dist}
+Version: 30
+Release: 0%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPL
 URL: http://ecryptfs.sourceforge.net
-Source0: http://downloads.sourceforge.net/ecryptfs/ecryptfs-utils-18.tar.bz2
+Source0: http://downloads.sourceforge.net/ecryptfs/ecryptfs-utils-30.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libgcrypt-devel keyutils-libs-devel openssl-devel pam-devel
 Conflicts: kernel < 2.6.19
@@ -37,6 +37,8 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}%{_libdir}/*.a
+rm -rf %{buildroot}%{_libdir}/*.la
 
 %post -p /sbin/ldconfig
 
@@ -55,12 +57,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ecryptfs-rewrap-passphrase
 %{_bindir}/ecryptfs-unwrap-passphrase
 %{_bindir}/ecryptfs-wrap-passphrase
+%{_bindir}/ecryptfs-add-passphrase
+%{_bindir}/ecryptfs-zombie-kill
+%{_bindir}/ecryptfs-zombie-list
 %{_bindir}/ecryptfsd
 %{_libdir}/libecryptfs.so.0.0.0
 %{_libdir}/libecryptfs.so.0
 %{_libdir}/ecryptfs
+%{_libdir}/pkgconfig/libecryptfs.pc
 /%{_lib}/security/pam_ecryptfs.so
 %{_mandir}/man7/ecryptfs.7.gz
+%{_mandir}/man8/ecryptfs-manager.8.gz
+%{_mandir}/man8/ecryptfsd.8.gz
+%{_mandir}/man8/mount.ecryptfs.8.gz
 
 %files devel
 %defattr(-,root,root,-)
@@ -69,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/ecryptfs.h
 
 %changelog
+* Fri Oct 05 2007 Mike Halcrow <mhalcrow@us.ibm.com> - 30-0
+- Bump to version 30. Several bugfixes. Key modules are overhauled
+  with a more sane API.
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 18-1
 - Rebuild for selinux ppc32 issue.