diff --git a/autofs-5.0.5-fix-included-map-read-fail-handling-2.patch b/autofs-5.0.5-fix-included-map-read-fail-handling-2.patch
new file mode 100644
index 0000000..e14f463
--- /dev/null
+++ b/autofs-5.0.5-fix-included-map-read-fail-handling-2.patch
@@ -0,0 +1,35 @@
+autofs-5.0.5 - fix included map read fail handling (again)
+
+From: Ian Kent <raven@themaw.net>
+
+If an included map read fails an error is returned and subsequent
+map entries are not read. We should report the failure but we
+shouldn't stop reading the map.
+---
+
+ CHANGELOG             |    1 +
+ modules/lookup_file.c |    2 --
+ 2 files changed, 1 insertions(+), 2 deletions(-)
+
+
+--- autofs-5.0.5.orig/CHANGELOG
++++ autofs-5.0.5/CHANGELOG
+@@ -28,6 +28,7 @@
+ - add locality as valid ldap master map attribute.
+ - add locality as valid ldap master map attribute fix.
+ - add simple bind authentication.
++- fix included map read fail handling (again).
+ 
+ 03/09/2009 autofs-5.0.5
+ -----------------------
+--- autofs-5.0.5.orig/modules/lookup_file.c
++++ autofs-5.0.5/modules/lookup_file.c
+@@ -656,8 +656,6 @@ int lookup_read_map(struct autofs_point 
+ 			if (!status) {
+ 				warn(ap->logopt,
+ 				     "failed to read included map %s", key);
+-				fclose(f);
+-				return NSS_STATUS_UNAVAIL;
+ 			}
+ 		} else {
+ 			char *s_key; 
diff --git a/autofs.spec b/autofs.spec
index b815c65..142280f 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -39,6 +39,7 @@ Patch26: autofs-5.0.5-add-locality-as-valid-ldap-master-map-attribute.patch
 Patch27: autofs-5.0.5-add-locality-as-valid-ldap-master-map-attribute-fix.patch
 Patch28: autofs-5.0.5-make-nfs4-default-for-redhat-replicated-selection.patch
 Patch29: autofs-5.0.5-add-simple-bind-auth.patch
+Patch30: autofs-5.0.5-fix-included-map-read-fail-handling-2.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel module-init-tools util-linux nfs-utils e2fsprogs libtirpc-devel
 Conflicts: cyrus-sasl-lib < 2.1.23-8
@@ -110,6 +111,7 @@ echo %{version}-%{release} > .version
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
+%patch30 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -162,6 +164,9 @@ fi
 %{_libdir}/autofs/
 
 %changelog
+* Mon May 3 2010 Ian Kent <ikent@redhat.com> - 1:5.0.5-25.fc13
+- fix included map read fail handling again (bz540594).
+
 * Wed Apr 7 2010 Ian Kent <ikent@redhat.com> - 1:5.0.5-24.fc13
 - make nfs4 default for replicated selection configuration (bz579949).
 - add simple bind authentication option (bz579951).