diff --git a/CHANGELOG b/CHANGELOG
index 5ca3a1a..8e4a8c1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -30,6 +30,7 @@
 - more expire re-work to cope better with shutdown following cthon tests.
 - allow hostname to start with numeric when validating.
 - fix included map lookup.
+- fix directory cleanup on expire.
 
 13/7/2006 autofs-5.0.1 rc1
 --------------------------
diff --git a/daemon/automount.c b/daemon/automount.c
index a8969c0..14b385c 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -470,9 +470,6 @@ int umount_multi(struct autofs_point *ap
 
 	left += umount_subtree_mounts(ap, path, is_autofs_fs);
 
-	if (left || is_autofs_fs)
-		return left;
-
 	/* Delete detritus like unwanted mountpoints and symlinks */
 	if (left == 0) {
 		update_map_cache(ap, path);