diff --git a/ChangeLog b/ChangeLog
index 0b7656b6850..b58681b7874 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-08  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* config-ml.in: Allow for PWDCMD to determine ML_POPDIR.
+
 2002-05-06  Loren J. Rittle <ljrittle@acm.org>
 
 	* ltmain.sh: Detect and handle object name conflicts
diff --git a/config-ml.in b/config-ml.in
index 16885f95f0e..a2780356a0c 100644
--- a/config-ml.in
+++ b/config-ml.in
@@ -756,7 +756,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
     esac
 
     # FIXME: POPDIR=${PWD=`pwd`} doesn't work here.
-    ML_POPDIR=`pwd`
+    ML_POPDIR=`${PWDCMD-pwd}`
     cd ${ml_dir}/${ml_libdir}
 
     if [ -f ${ml_newsrcdir}/configure ]; then