diff --git a/ChangeLog b/ChangeLog
index 5688adf3..83f41360 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-20  Tim Van Holder  <tim.van.holder@pandora.be>
+
+	* man/Makefile.am (.x.1): Use @PATH_SEPARATOR@, not ':' to set up
+	$PATH.  Also set AUTOM4TE_CFG, so we can process autom4te properly.
+
 2001-09-20  Tim Van Holder  <tim.van.holder@pandora.be>
 
 	* bin/autoscan.in: Add 'exec-perl-if-not-run-by-perl'.
diff --git a/man/Makefile.am b/man/Makefile.am
index 464faf0d..03e19a19 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -46,10 +46,12 @@ SUFFIXES = .x .1
 
 .x.1:
 	echo "Updating man page $@"
-	PATH=$(top_builddir)/bin:$(top_srcdir)/config:$$PATH ;\
-	export PATH ;\
-	autom4te_perllibdir=$(top_srcdir)/lib;\
+	PATH="$(top_builddir)/bin@PATH_SEPARATOR@$(top_srcdir)/config@PATH_SEPARATOR@$$PATH"; \
+	export PATH; \
+	autom4te_perllibdir=$(top_srcdir)/lib; \
 	export autom4te_perllibdir; \
+	AUTOM4TE_CFG=$(top_srcdir)/lib/autom4te.cfg; \
+	export AUTOM4TE_CFG; \
 	$(HELP2MAN) \
 	    --include=$(srcdir)/$*.x \
 	    --include=$(srcdir)/common.x \