diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 19c5a6610dae..e9ae056e6448 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-25  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.in (top_builddir): Define to .
+
 2004-05-25  Alexandre Oliva  <aoliva@redhat.com>
 
 	* configure.ac (gcc_cv_ld): Prefer in-tree ld over whatever the
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index bd6afbe16541..ad4a7cd57d6c 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -77,8 +77,8 @@ docdir = @srcdir@/doc
 abs_srcdir = @abs_srcdir@
 abs_docdir = @abs_srcdir@/doc
 
-# Top build directory, relative to here.
-top_builddir = ..
+# Top build directory for this package, relative to here.
+top_builddir = .
 # objdir is set by configure.
 # It's normally the absolute path to the current directory.
 objdir = @objdir@
diff --git a/intl/ChangeLog b/intl/ChangeLog
index e3df6a88bed1..9f4e7f51f533 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-25  Paolo Bonzini  <bonzini@gnu.org>
+
+        * configure.ac: Point config.intl to the parent directory of
+        ${top_builddir}.
+	* configure: Regenerate.
+
 2004-03-10  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* configure.ac: Bump AC_PREREQ to 2.59.
diff --git a/intl/configure b/intl/configure
index 32d77536b182..f212db5371e3 100755
--- a/intl/configure
+++ b/intl/configure
@@ -7037,8 +7037,10 @@ LIBINTL_DEP=
 INCINTL=
 case $USE_INCLUDED_LIBINTL in
   yes)
-    LIBINTL_DEP='${top_builddir}/intl/libintl.a'
-    INCINTL='-I${top_builddir}/intl'
+    LIBINTL=`echo $LIBINTL | sed 's,${top_builddir},&/..,' `
+    LTLIBINTL=`echo $LTLIBINTL | sed 's,${top_builddir},&/..,' `
+    LIBINTL_DEP='${top_builddir}/../intl/libintl.a'
+    INCINTL='-I${top_builddir}/../intl'
     ;;
 esac
 
diff --git a/intl/configure.ac b/intl/configure.ac
index 516057b3af27..0d9efc98182a 100644
--- a/intl/configure.ac
+++ b/intl/configure.ac
@@ -24,8 +24,10 @@ LIBINTL_DEP=
 INCINTL=
 case $USE_INCLUDED_LIBINTL in
   yes)
-    LIBINTL_DEP='${top_builddir}/intl/libintl.a'
-    INCINTL='-I${top_builddir}/intl'
+    LIBINTL=`echo $LIBINTL | sed 's,${top_builddir},&/..,' `
+    LTLIBINTL=`echo $LTLIBINTL | sed 's,${top_builddir},&/..,' `
+    LIBINTL_DEP='${top_builddir}/../intl/libintl.a'
+    INCINTL='-I${top_builddir}/../intl'
     ;;
 esac