diff --git a/bin/dunecontrol b/bin/dunecontrol
index b7207868ced9a7d38994886d4c3f12828587206a..bab9dc758bb6553e86275c3e28af2243d884ce60 100755
--- a/bin/dunecontrol
+++ b/bin/dunecontrol
@@ -530,7 +530,7 @@ run_default_update () {
 }
 
 run_default_autogen () {
-  if test "x$USE_CMAKE" != "xyes" || test  ! -e $(eval "echo \$PATH_$module")/CMakeLists.txt ; then
+  if test "x$USE_CMAKE" != "xyes" || test  ! -e "$(eval "echo \$PATH_$module")/CMakeLists.txt" ; then
     PARAMS="$CMD_FLAGS"
     local M4_PATH=""
     if test -f configure.ac && \
@@ -556,7 +556,7 @@ run_default_autogen () {
 
 run_default_configure () {
   PARAMS="$CMD_FLAGS"
-  if test "x$USE_CMAKE" = "xyes" && test -e $(eval "echo \$PATH_$module")/CMakeLists.txt; then
+  if test "x$USE_CMAKE" = "xyes" && test -e "$(eval "echo \$PATH_$module")/CMakeLists.txt"; then
     LOCAL_USE_CMAKE=yes
   else
     LOCAL_USE_CMAKE=no
@@ -623,8 +623,8 @@ run_default_configure () {
       test -d "$BUILDDIR" || mkdir "$BUILDDIR"
       SRCDIR="$PWD"
       cd "$BUILDDIR"
-      echo "$PREPARAMS $CMAKE -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_MODULE_PATH=\"$CMAKE_MODULE_PATH\" $CMAKE_PARAMS $CMAKE_FLAGS $SRCDIR"
-      eval $PREPARAMS $CMAKE "-DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_MODULE_PATH=\"$CMAKE_MODULE_PATH\" $CMAKE_PARAMS $CMAKE_FLAGS $SRCDIR" || exit 1
+      echo "$PREPARAMS $CMAKE -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_MODULE_PATH=\"$CMAKE_MODULE_PATH\" $CMAKE_PARAMS $CMAKE_FLAGS \"$SRCDIR\""
+      eval $PREPARAMS $CMAKE "-DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_MODULE_PATH=\"$CMAKE_MODULE_PATH\" $CMAKE_PARAMS $CMAKE_FLAGS \"$SRCDIR\"" || exit 1
     else
       PARAMS="$PARAMS ACLOCAL_AMFLAGS=\"$ACLOCAL_FLAGS\""
       echo ./configure "$PARAMS"
diff --git a/lib/dunemodules.lib b/lib/dunemodules.lib
index 8eef780cd16cf362ec5b8afba19693a08e4fb8b8..cbf5eabe360bdb3e8812ad90e40ad6f4a7d7ee51 100644
--- a/lib/dunemodules.lib
+++ b/lib/dunemodules.lib
@@ -427,7 +427,7 @@ eval_control() {
       # load functions defined in $file
       # if $command is not defined in $file,
       # then the default implementation will be executed
-      eval "$($GREP -v "^[-$ALNUM]\{1,\}:" $file)"
+      eval "$($GREP -v "^[-$ALNUM]\{1,\}:" "$file")"
       # execute $command
       $command
     ) || false