diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 5a1c32557f3f17d9946e084a4cdb6ec3a5c167af..f21088bc42d24ad7029902dddaf1f99e89f097ed 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-25  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.am: the correct directory for
+	gettext include files is given by @INCINTL@.
+	* Makefile.in: Regenerate.
+
 2004-05-24  Paolo Bonzini  <bonzini@gnu.org>
 
 	* system.h [!ENABLE_NLS]: dgettext takes two
diff --git a/libcpp/Makefile.am b/libcpp/Makefile.am
index 5c6b66cf3e19c70f28d0272994e407a1080532a0..4d9be51d63fbe7f0cfda9844a070d5cf92734638 100644
--- a/libcpp/Makefile.am
+++ b/libcpp/Makefile.am
@@ -1,6 +1,6 @@
 localedir = $(datadir)/locale
 ACLOCAL_AMFLAGS = -I ../config
-AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir) -I$(srcdir)/../intl \
+AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir) @INCINTL@ \
 	-I$(srcdir)/include -DLOCALEDIR="\"$(localedir)\""
 
 noinst_LIBRARIES = libcpp.a
diff --git a/libcpp/Makefile.in b/libcpp/Makefile.in
index 05390cba6f1d4a7c98654a5ed8b1fcaed8017838..5df4f3e2f1b16a89e1c0ffeca2a5a2ec33ff56d6 100644
--- a/libcpp/Makefile.in
+++ b/libcpp/Makefile.in
@@ -200,7 +200,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 localedir = $(datadir)/locale
 ACLOCAL_AMFLAGS = -I ../config
-AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir) -I$(srcdir)/../intl \
+AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir) @INCINTL@ \
 	-I$(srcdir)/include -DLOCALEDIR="\"$(localedir)\""
 
 noinst_LIBRARIES = libcpp.a