diff --git a/autofs-5.0.3-basedn-with-spaces-fix-3.patch b/autofs-5.0.3-basedn-with-spaces-fix-3.patch
new file mode 100644
index 0000000..7c0477f
--- /dev/null
+++ b/autofs-5.0.3-basedn-with-spaces-fix-3.patch
@@ -0,0 +1,25 @@
+diff --git a/CHANGELOG b/CHANGELOG
+index 8d09e93..b172579 100644
+--- a/CHANGELOG
++++ b/CHANGELOG
+@@ -2,6 +2,7 @@
+ -----------------------
+ - correct configure test for ldapr page control functions.
+ - catch "-xfn" map type and issue "no supported" message.
++- correction for handling of LDAP base dns with spaces.
+  
+ 14/01/2008 autofs-5.0.3
+ -----------------------
+diff --git a/lib/master_tok.l b/lib/master_tok.l
+index 2a6fdf9..7f1de90 100644
+--- a/lib/master_tok.l
++++ b/lib/master_tok.l
+@@ -289,7 +289,7 @@ OPTNTOUT	(-n{OPTWS}|-n{OPTWS}={OPTWS}|--negative-timeout{OPTWS}|--negative-timeo
+ 		return EQUAL;
+ 	}
+ 
+-	{DNNAMESTR1}/"," {
++	{DNNAMESTR1}/","{DNATTRSTR} {
+ 		strcpy(master_lval.strtype, master_text);
+ 		return DNNAME;
+ 	}
diff --git a/autofs-5.0.3-xfn-not-supported.patch b/autofs-5.0.3-xfn-not-supported.patch
new file mode 100644
index 0000000..ebbee86
--- /dev/null
+++ b/autofs-5.0.3-xfn-not-supported.patch
@@ -0,0 +1,75 @@
+diff --git a/CHANGELOG b/CHANGELOG
+index 98855f5..8d09e93 100644
+--- a/CHANGELOG
++++ b/CHANGELOG
+@@ -1,6 +1,7 @@
+ ??/??/2008 autofs-5.0.4
+ -----------------------
+ - correct configure test for ldapr page control functions.
++- catch "-xfn" map type and issue "no supported" message.
+  
+ 14/01/2008 autofs-5.0.3
+ -----------------------
+diff --git a/lib/master_parse.y b/lib/master_parse.y
+index b450122..2184b4f 100644
+--- a/lib/master_parse.y
++++ b/lib/master_parse.y
+@@ -50,6 +50,7 @@ static int add_multi_mapstr(void);
+ 
+ static int master_error(const char *s);
+ static int master_notify(const char *s);
++static int master_msg(const char *s);
+  
+ static char *path;
+ static char *type;
+@@ -119,6 +120,7 @@ static int master_fprintf(FILE *, char *, ...);
+ %token <strtype> DNNAME
+ %token <strtype> MAPHOSTS
+ %token <strtype> MAPNULL
++%token <strtype> MAPXFN
+ %token <strtype> MAPNAME
+ %token <inttype> NUMBER
+ %token <strtype> OPTION
+@@ -283,6 +285,12 @@ map:	PATH
+ 			YYABORT;
+ 		}
+ 	}
++	| MAPXFN
++	{
++		master_notify($1);
++		master_msg("X/Open Federated Naming service not supported");
++		YYABORT;
++	}
+ 	| MAPNULL
+ 	{
+ 		type = master_strdup($1 + 1);
+@@ -598,6 +606,12 @@ static int master_notify(const char *s)
+ 	return(0);
+ }
+ 
++static int master_msg(const char *s)
++{
++	logmsg("%s", s);
++	return 0;
++}
++
+ static void local_init_vars(void)
+ {
+ 	path = NULL;
+diff --git a/lib/master_tok.l b/lib/master_tok.l
+index d908047..2a6fdf9 100644
+--- a/lib/master_tok.l
++++ b/lib/master_tok.l
+@@ -215,6 +215,12 @@ OPTNTOUT	(-n{OPTWS}|-n{OPTWS}={OPTWS}|--negative-timeout{OPTWS}|--negative-timeo
+ 		return MAPNULL;
+ 	}
+ 
++	"-xfn" {
++		BEGIN(OPTSTR);
++		strcpy(master_lval.strtype, master_text);
++		return MAPXFN;
++	}
++
+ 	"//" {
+ 		BEGIN(DNSTR);
+ 		yyless(0);
diff --git a/autofs.spec b/autofs.spec
index 59ded7c..ff3517b 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -4,13 +4,15 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.3
-Release: 2
+Release: 3
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
 URL: http://wiki.autofs.net/
 Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.bz2
 Patch1: autofs-5.0.3-ldap-page-control-configure-fix.patch
+Patch2: autofs-5.0.3-xfn-not-supported.patch
+Patch3: autofs-5.0.3-basedn-with-spaces-fix-3.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
 Conflicts: kernel < 2.6.17
@@ -53,6 +55,8 @@ inkludera nätfilsystem, CD-ROM, floppydiskar, och så vidare.
 %setup -q
 echo %{version}-%{release} > .version
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -105,6 +109,10 @@ fi
 %{_libdir}/autofs/
 
 %changelog
+* Mon Jan 21 2008 Ian Kent <ikent@redhat.com> - 5.0.3-3
+- catch "-xfn" map type and issue "no supported" message.
+- another correction for handling of LDAP base dns with spaces.
+
 * Mon Jan 14 2008 Ian Kent <ikent@redhat.com> - 5.0.3-2
 - correct configure test for ldap page control functions.