diff --git a/autofs.spec b/autofs.spec
index 182e7b0..fb3a5b7 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.1
-%define release 0.rc1.16
+%define release 0.rc1.17
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -45,6 +45,8 @@ Patch31: autofs-5.0.1-rc1-included-map-lookup-fix.patch
 Patch32: autofs-5.0.1-rc1-dir-cleanup-on-expire-fix.patch
 Patch33: autofs-5.0.1-rc1-cancel-tasks-at-shutdown.patch
 Patch34: autofs-5.0.1-rc1-included-map-wild-lookup-fix.patch
+Patch35: autofs-5.0.1-rc1-cancel-tasks-at-shutdown-fix.patch
+Patch36: autofs-5.0.1-rc1-concurrent-mount-expire-nested-submount-race.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -118,6 +120,8 @@ echo %{version}-%{release} > .version
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
+%patch35 -p1
+%patch36 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -174,6 +178,10 @@ exit 0
 %{_libdir}/autofs/*
 
 %changelog
+* Fri Aug 25 2006 Ian Kent <ikent@redhat.com> - 5.0.1-0.rc1.17
+- fix task cancelation at shutdown (more)
+- fix concurrent mount and expire race with nested submounts.
+
 * Sun Aug 20 2006 Ian Kent <ikent@redhat.com> - 5.0.1-0.rc1.16
 - fix included map lookup.
 - fix directory cleanup on expire.