diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8e158adfc77a..8fd572e4583e 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-10  Manfred Hollstein  <manfredh@redhat.com>
+
+	* configure.in (LIBFFIINCS): Quote uses of $(top_srcdir)
+	and $(MULTIBUILDTOP).
+	* configure: Re-generate.
+
 2001-09-10  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
 
 	* include/jvm.h (_Jv_AllocRawObj): New prototype.
diff --git a/libjava/configure b/libjava/configure
index 7ee698c696db..96a2ab82f6b8 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -2834,7 +2834,7 @@ if test "$with_libffi" != no; then
 EOF
 
    LIBFFI=../libffi/libfficonvenience.la
-   LIBFFIINCS="-I$(top_srcdir)/../libffi/include -I$(MULTIBUILDTOP)../libffi/include"
+   LIBFFIINCS='-I$(top_srcdir)/../libffi/include -I$(MULTIBUILDTOP)../libffi/include'
 fi
 
 
diff --git a/libjava/configure.in b/libjava/configure.in
index 7c3534ef8835..4dfe5d207a9a 100644
--- a/libjava/configure.in
+++ b/libjava/configure.in
@@ -170,7 +170,7 @@ LIBFFIINCS=
 if test "$with_libffi" != no; then
    AC_DEFINE(USE_LIBFFI)
    LIBFFI=../libffi/libfficonvenience.la
-   LIBFFIINCS="-I$(top_srcdir)/../libffi/include -I$(MULTIBUILDTOP)../libffi/include"
+   LIBFFIINCS='-I$(top_srcdir)/../libffi/include -I$(MULTIBUILDTOP)../libffi/include'
 fi
 AC_SUBST(LIBFFI)
 AC_SUBST(LIBFFIINCS)