diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 85fa04f70382ae9f59e1f8410b424890c71a6408..5a46149876757155b613659ad62726945d744ffb 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,11 @@
+2004-11-09  Joseph S. Myers  <joseph@codesourcery.com>
+
+	* Makefile.in ($(PACKAGE).pot): New rule.  Depend on
+	po/$(PACKAGE).pot.
+	(po/$(PACKAGE).pot): Use ":" instead of "," in --keyword
+	arguments.  Add keywords _, N_, SYNTAX_ERROR and SYNTAX_ERROR2.
+	Remove local srcdir path from generated file.
+
 2004-11-04  Zack Weinberg  <zack@codesourcery.com>
             Gerald Pfeifer  <gerald@pfeifer.com>
 
diff --git a/libcpp/Makefile.in b/libcpp/Makefile.in
index bd1861c9b4a2243e4b6cef2bbca59f64cb4e31bb..8a7a48983654eca33f75c21c8f36ad2e27c7b6ba 100644
--- a/libcpp/Makefile.in
+++ b/libcpp/Makefile.in
@@ -207,14 +207,19 @@ update-po: $(CATALOGS:.gmo=.pox)
 	                else echo $(srcdir)/po/$(PACKAGE).pot; fi` -o $@
 
 # Rule for regenerating the message template.
+$(PACKAGE).pot: po/$(PACKAGE).pot
 po/$(PACKAGE).pot: $(libcpp_a_SOURCES)
 	-test -d $(srcdir)/po || mkdir $(srcdir)/po
 	$(XGETTEXT) --default-domain=$(PACKAGE) \
-	  --keyword=cpp_error,3 --keyword=cpp_errno,3 \
-	  --keyword=cpp_error_with_line,5 \
+	  --keyword=_ --keyword=N_ \
+	  --keyword=cpp_error:3 --keyword=cpp_errno:3 \
+	  --keyword=cpp_error_with_line:5 \
+	  --keyword=SYNTAX_ERROR --keyword=SYNTAX_ERROR2 \
 	  --copyright-holder="Free Software Foundation, Inc." \
 	  --msgid-bugs-address="http://gcc.gnu.org/bugs.html" \
-	  --language=c -o po/$(PACKAGE).pot $^
+	  --language=c -o po/$(PACKAGE).pot.tmp $^
+	sed 's:$(srcdir)/::g' <po/$(PACKAGE).pot.tmp >po/$(PACKAGE).pot
+	rm po/$(PACKAGE).pot.tmp
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.