diff --git a/ChangeLog b/ChangeLog
index e7b69c5e..881988bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-26  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* man/generate_translations.mak, man/po/Makefile.in.in: Add
+	--expand-all-entities to the call to xml2po to avoid translating
+	the external entities separately.
+
 2007-11-26  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* man/login.defs.d/, man/login.defs.d/CHFN_RESTRICT.xml,
diff --git a/man/generate_translations.mak b/man/generate_translations.mak
index 84c91dbb..c4dbc2e9 100644
--- a/man/generate_translations.mak
+++ b/man/generate_translations.mak
@@ -3,7 +3,7 @@ if ENABLE_REGENERATE_MAN
 LANG=$(notdir $(CURDIR))
 
 %.xml: ../%.xml ../po/$(LANG).po
-	xml2po -l $(LANG) -p ../po/$(LANG).po -o $@ ../$@
+	xml2po --expand-all-entities -l $(LANG) -p ../po/$(LANG).po -o $@ ../$@
 	sed -i 's:\(^<refentry .*\)>:\1 lang="$(LANG)">:' $@
 
 include ../generate_mans.mak
diff --git a/man/po/Makefile.in.in b/man/po/Makefile.in.in
index 0ed5f6f4..07e713a0 100644
--- a/man/po/Makefile.in.in
+++ b/man/po/Makefile.in.in
@@ -90,9 +90,9 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
 $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
 	@tmpdir=`pwd`; \
 	echo -n "cd $(top_srcdir)/man && "; \
-	echo "xml2po -o $(tmpdir)/$(DOMAIN).po $(notdir $(POTFILES))"; \
+	echo "xml2po --expand-all-entities -o $(tmpdir)/$(DOMAIN).po $(notdir $(POTFILES))"; \
 	cd $(top_srcdir)/man; \
-	xml2po -o $$tmpdir/$(DOMAIN).po $(notdir $(POTFILES)); \
+	xml2po --expand-all-entities -o $$tmpdir/$(DOMAIN).po $(notdir $(POTFILES)); \
 	cd $$tmpdir
 	test ! -f $(DOMAIN).po || { \
 	  if test -f $(srcdir)/$(DOMAIN).pot; then \