diff --git a/expat/configure.ac b/expat/configure.ac
index d2b0f07e..b4e56dfd 100644
--- a/expat/configure.ac
+++ b/expat/configure.ac
@@ -241,7 +241,7 @@ AS_IF([test "x$with_docbook" != xno],
   [if test "x$with_docbook" != xcheck; then 
     AC_MSG_ERROR([Required program 'docbook2x-man' not found.])])])
 
-AM_CONDITIONAL(WITH_DOCBOOK, [test x${DOCBOOK_TO_MAN} != x])
+AM_CONDITIONAL(WITH_DOCBOOK, [test "x${DOCBOOK_TO_MAN}" != x])
 
 AC_CONFIG_FILES([Makefile expat.pc])
 AC_CONFIG_FILES([
diff --git a/expat/doc/Makefile.am b/expat/doc/Makefile.am
index 7c79aa41..d8a35c0d 100644
--- a/expat/doc/Makefile.am
+++ b/expat/doc/Makefile.am
@@ -32,8 +32,9 @@ dist_man_MANS = xmlwf.1
 
 xmlwf.1: xmlwf.xml
 if WITH_DOCBOOK
+	-rm -f $@
 	$(DOCBOOK_TO_MAN) $<
-	mv XMLWF.1 $@
+	test -f $@ || mv XMLWF.1 $@
 else
 	@echo 'ERROR: Configure with --with-docbook for "make dist".' 1>&2
 	@false