diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index b63d471cae..5d6cb8b4a0 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.
+
 2003-12-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* support/Makefile.am: Pass @RTEMS_BSP@ to AM_CPPFLAGS.
diff --git a/c/src/acinclude.m4 b/c/src/acinclude.m4
index fdf70fb4b0..59461fea72 100644
--- a/c/src/acinclude.m4
+++ b/c/src/acinclude.m4
@@ -79,7 +79,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
 fi