diff --git a/src/mod/Makefile.am b/src/mod/Makefile.am
index d8c42c6009..1dc7b59408 100644
--- a/src/mod/Makefile.am
+++ b/src/mod/Makefile.am
@@ -7,7 +7,7 @@ $(OUR_MODULES) $(OUR_CLEAN_MODULES) $(OUR_INSTALL_MODULES) $(OUR_UNINSTALL_MODUL
 	@set fnord $$MAKEFLAGS; amf=$$2; \
 	target=`echo $@ | sed -e 's|^.*-||'`; \
 	modname=`echo $@ | sed -e 's|-.*||'`; \
-	confmoddir=`cat $(switch_builddir)/modules.conf | grep $$modname$$ | sed -e 's|#||' `; \
+	confmoddir=`cat $(switch_builddir)/modules.conf | grep $$modname | sed -e 's|#||' | sed -e 's| ||' `; \
 	if test -z "$$confmoddir" ; then moddir=$@ ; else  \
 		if test -d  "$(switch_srcdir)/src/mod/$$confmoddir" ; then \
 			moddir="$(switch_srcdir)/src/mod/$$confmoddir" ; else \
@@ -17,7 +17,7 @@ $(OUR_MODULES) $(OUR_CLEAN_MODULES) $(OUR_INSTALL_MODULES) $(OUR_UNINSTALL_MODUL
 	if test -z "$$target" ; then target="all" ; fi ; \
 	echo ;\
 	echo making $$target $$modname ;\
-	(if test -f $$moddir/Makefile ; then \
+	(if test -f "$$moddir/Makefile" ; then \
 		cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) $$target; else\
 		cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules $$target ;\
 	fi;)\