diff --git a/ChangeLog b/ChangeLog
index b80776941f..0da6745795 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2004-07-14      Jay Monkman
+2004-08-17	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* acinclude.m4 (_RTEMS_CONFIG_SUBDIR): Quote ac_popdir uses.
+
+2004-07-14      Joel Sherrill <joel@OARcorp.com>
 
         * MAINTAINERS: Added Jay Monkman as ARM architecture maintainer
 
diff --git a/acinclude.m4 b/acinclude.m4
index 37c76a0527..1115a6b666 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -263,7 +263,7 @@ if test "$no_recursion" != yes; then
         AC_MSG_ERROR([$ac_sub_configure failed for $ac_dir])
     fi
 
-    cd $ac_popdir
+    cd "$ac_popdir"
   done
  fi
 fi
diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index 909da552e1..fab042e755 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-17	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* acinclude.m4 (_RTEMS_CONFIG_SUBDIR): Quote ac_popdir uses.
+
 2004-07-28  Joel Sherrill <joel@OARcorp.com>
 
     * aclocal/version.m4: Updated to rtems-4.6.99.1.
diff --git a/c/src/acinclude.m4 b/c/src/acinclude.m4
index 891da200fc..910bb462e3 100644
--- a/c/src/acinclude.m4
+++ b/c/src/acinclude.m4
@@ -72,7 +72,7 @@ if test "$no_recursion" != yes; then
         AC_MSG_ERROR([$ac_sub_configure failed for $ac_subdir])
     fi
 
-    cd $ac_popdir
+    cd "$ac_popdir"
   done
 fi
 ])