diff --git a/configure b/configure
index 4aedd91d..42d08e88 100755
--- a/configure
+++ b/configure
@@ -2757,6 +2757,7 @@ if test $ac_cv_lib_dl_dlopen = yes; then
 fi
 
 	MODFLAGS=`echo $CXXFLAGS | sed 's/-rdynamic//g'`
+	MODFLAGS="$MODFLAGS -I`pwd`"
 	MODTARGET="modules"
 	appendLib -ldl
 fi
diff --git a/configure.in b/configure.in
index c97fca17..705e816f 100644
--- a/configure.in
+++ b/configure.in
@@ -53,6 +53,7 @@ fi
 if test "$MODULES" = "yes"; then
 	AC_CHECK_LIB( dl, dlopen, appendCXX -D_MODULES -rdynamic,, )
 	MODFLAGS=`echo $CXXFLAGS | sed 's/-rdynamic//g'`
+	MODFLAGS="$MODFLAGS -I`pwd`"
 	MODTARGET="modules"
 	appendLib -ldl
 fi
diff --git a/modules/buildmod.in b/modules/buildmod.in
index cb6b813f..f56c9545 100644
--- a/modules/buildmod.in
+++ b/modules/buildmod.in
@@ -22,14 +22,12 @@ if [ "$1" = "--libs" ]; then
 fi
 
 if [ "$1" = "--all" ]; then
-	for i in *; do
-		FILE="$FILE $i"
-	done
+	FILES=`ls`
 else
 	FILES=$@
 fi
 
-for arg in "$FILES"
+for arg in $FILES
 do
 	if test -d $arg && test "$arg" != "CVS"; then
 		(cd $arg && make || exit 1)