diff --git a/ChangeLog b/ChangeLog
index e28b6a6d9b..a28ec9e7ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-18	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* aclocal/ppc.m4 (RTEMS_PPC_EXCEPTIONS): Quote ac_popdir uses.
+	* aclocal/target.m4 (_RTEMS_POP_BUILDDIR): Ditto.
+	* acinclude.m4 (_RTEMS_CONFIG_SUBDIR): Quote ac_popdir uses.
+
 2004-08-18	Ralf Corsepius <ralf_corsepius@rtems.org>
 
 	* acinclude.m4: Fix m4-underquoting.
diff --git a/acinclude.m4 b/acinclude.m4
index 95a05c216c..7ec20c9596 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -261,7 +261,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/aclocal/ppc.m4 b/aclocal/ppc.m4
index 3626e5c42c..3bab43fd4d 100644
--- a/aclocal/ppc.m4
+++ b/aclocal/ppc.m4
@@ -80,7 +80,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
 ])
diff --git a/aclocal/target.m4 b/aclocal/target.m4
index 5783146f87..29cf5c9a36 100644
--- a/aclocal/target.m4
+++ b/aclocal/target.m4
@@ -105,7 +105,7 @@ dnl _RTEMS_POP_BUILDDIR
 dnl
 AC_DEFUN([_RTEMS_POP_BUILDDIR],
 [
-  cd $ac_popdir
+  cd "$ac_popdir"
 ])
 
 dnl