diff --git a/autofs-5.1.8-fix-multi-mount-check.patch b/autofs-5.1.8-fix-multi-mount-check.patch
new file mode 100644
index 0000000..40ab386
--- /dev/null
+++ b/autofs-5.1.8-fix-multi-mount-check.patch
@@ -0,0 +1,44 @@
+autofs-5.1.8 - fix multi-mount check
+
+From: Ian Kent <raven@themaw.net>
+
+When checking if a mount location is a multi-mount after the first location
+the next '-' or '/' indicates it's a multi-mount.
+
+But the '-' can be part of a mount location and can follow a space leading
+to incorrectly deciding the location is a multi-mount.
+
+Signed-off-by: Ian Kent <raven@themaw.net>
+---
+ CHANGELOG           |    1 +
+ modules/parse_sun.c |    9 ++++++++-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+--- autofs-5.1.7.orig/CHANGELOG
++++ autofs-5.1.7/CHANGELOG
+@@ -158,6 +158,7 @@
+ - fix incorrect matching of cached wildcard key.
+ - fix expire retry looping.
+ - allow -null map in indirect maps.
++- fix multi-mount check.
+ 
+ 25/01/2021 autofs-5.1.7
+ - make bind mounts propagation slave by default.
+--- autofs-5.1.7.orig/modules/parse_sun.c
++++ autofs-5.1.7/modules/parse_sun.c
+@@ -787,7 +787,14 @@ static int check_is_multi(const char *ma
+ 		if (not_first_chunk) {
+ 			if (*p == '"')
+ 				p++;
+-			if (*p == '/' || *p == '-') {
++			/*
++			 * Although an options string here would mean
++			 * we have a multi-mount we can't rely on it
++			 * since it's also valid in a mount location.
++			 */
++			if (*p == '-')
++				p++;
++			if (*p == '/') {
+ 				multi = 1;
+ 				break;
+ 			}
diff --git a/autofs.spec b/autofs.spec
index ebc5a33..c5676d2 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -12,7 +12,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.1.7
-Release: 56%{?dist}
+Release: 57%{?dist}
 Epoch: 1
 License: GPLv2+
 Source: https://www.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}-2.tar.gz
@@ -187,6 +187,7 @@ Patch174: autofs-5.1.8-fix-incorrect-matching-of-cached-wildcard-key.patch
 Patch175: autofs-5.1.8-fix-expire-retry-looping.patch
 
 Patch176: autofs-5.1.8-allow-null-map-in-indirect-maps.patch
+Patch177: autofs-5.1.8-fix-multi-mount-check.patch
 
 %if %{with_systemd}
 BuildRequires: systemd-units
@@ -418,6 +419,7 @@ echo %{version}-%{release} > .version
 %patch175 -p1
 
 %patch176 -p1
+%patch177 -p1
 
 %build
 LDFLAGS=-Wl,-z,now
@@ -526,6 +528,12 @@ fi
 %dir /etc/auto.master.d
 
 %changelog
+* Mon Oct 30 2023 Ian Kent <ikent@redhat.com> - 1:5.1.7-57
+- RHEL-13084 - multi mount detection fails for share with blank+dash causing
+  SEGV crash
+  - fix multi-mount check.
+- Resolves: RHEL-13084
+
 * Thu Oct 26 2023 Ian Kent <ikent@redhat.com> - 1:5.1.7-56
 - RHEL-13083 - autofs attempts to mount nonexistant ".hidden" filesystems
   - allow -null map in indirect maps.