diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 03fe33773c981d090e2a150109f5b1cfb333f22e..d81a049e64634445ebc6336d28d75e53162e71b3 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-09  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.am (all-local): New.
+	* Makefile.in: Regenerate.
+
 2004-06-06  Roger Sayle  <roger@eyesopen.com>
 
 	* Makefile.am (LIBICONV): Declare.
diff --git a/libcpp/Makefile.am b/libcpp/Makefile.am
index 20e97b852c8a5856d1b95fa324c6a426c44d1550..bb3317a16fd5c549ccc0bdda5e60fe704baf962d 100644
--- a/libcpp/Makefile.am
+++ b/libcpp/Makefile.am
@@ -23,6 +23,8 @@ GMSGFMT = @GMSGFMT@
 MSGMERGE = msgmerge
 CATALOGS = @CATALOGS@
 
+all-local: build-po
+
 if ENABLE_NLS
 build-po: $(CATALOGS)
 update-po: $(CATALOGS:.gmo=.pox)
diff --git a/libcpp/Makefile.in b/libcpp/Makefile.in
index 0123c4d9469db89c877ba1bb61698a19ed3a4c46..0c44a14c14e31066a64802de118d54e591494f6f 100644
--- a/libcpp/Makefile.in
+++ b/libcpp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -59,9 +59,9 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
 AR = ar
 ARFLAGS = cru
+LIBRARIES = $(noinst_LIBRARIES)
 libcpp_a_AR = $(AR) $(ARFLAGS)
 libcpp_a_LIBADD =
 am_libcpp_a_OBJECTS = charset.$(OBJEXT) directives.$(OBJEXT) \
@@ -352,7 +352,7 @@ TAGS:  $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
+	  test -z "$$unique" && unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
@@ -508,7 +508,8 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-am
-all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) config.h
+all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) config.h \
+		all-local
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -587,9 +588,9 @@ ps-am:
 
 uninstall-am: uninstall-info-am
 
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	clean-generic clean-noinstLIBRARIES clean-noinstPROGRAMS ctags \
-	dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
+.PHONY: CTAGS GTAGS all all-am all-local am--refresh check check-am \
+	clean clean-generic clean-noinstLIBRARIES clean-noinstPROGRAMS \
+	ctags dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
 	dist-zip distcheck distclean distclean-compile \
 	distclean-generic distclean-hdr distclean-tags distcleancheck \
 	distdir distuninstallcheck dvi dvi-am html html-am info \
@@ -602,6 +603,8 @@ uninstall-am: uninstall-info-am
 	uninstall-am uninstall-info-am
 
 
+all-local: build-po
+
 @ENABLE_NLS_TRUE@build-po: $(CATALOGS)
 @ENABLE_NLS_TRUE@update-po: $(CATALOGS:.gmo=.pox)
 @ENABLE_NLS_FALSE@build-po:
diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 08459ef6bfb4c806b583360e6be5f9f905c9a256..8c444e2412b1d61c44fc46a242e752da0a9bc9cd 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-09  Paolo Bonzini  <bonzini@gnu.org>
+
+	* gcc_release (build_sources): Move the libcpp gmo files
+	to the source directory.
+
 2004-06-03  Joseph S. Myers  <jsm@polyomino.org.uk>
 
 	* gcc_release (maybe_build_tarfile): New function.
diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index 8b6a5603006c93cc7369165591b1ff7c8804cd7c..5a1d5d5ccdffd060da0119c419c7bbb306fb1c9a 100755
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -248,6 +248,7 @@ EOF
 
   # Move message catalogs to source directory.
   mv ../objdir/gcc/po/*.gmo gcc/po/
+  [ -f libcpp/po/cpplib.pot ] && mv ../objdir/libcpp/po/*.gmo libcpp/po/
 
   # Create a "MD5SUMS" file to use for checking the validity of the release.
   find . -type f |sed -e 's:^\./::' -e '/MD5SUMS/d' |sort |xargs md5sum >MD5SUMS