diff --git a/ChangeLog b/ChangeLog
index aa7be07f..45ccd1e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-09  Andreas Schwab  <schwab@suse.de>
+
+	* lib/autoconf/status.m4 (_AC_SRCPATHS): Handle empty
+	ac_top_builddir when setting ac_abs_top_builddir.
+
 2002-04-06  Kevin Ryde  <user42@zip.com.au>
 
 	* doc/autoconf.texi (Systemology): Add link to Unix V7 online docs.
diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index e5189937..f7bc740c 100644
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -163,7 +163,7 @@ esac
 # Don't blindly perform a `cd $1/$ac_foo && pwd` since $ac_foo can be
 # absolute.
 ac_abs_builddir=`cd $1 && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd $1 && cd $ac_top_builddir && pwd`
+ac_abs_top_builddir=`cd $1 && cd ${ac_top_builddir}. && pwd`
 ac_abs_srcdir=`cd $1 && cd $ac_srcdir && pwd`
 ac_abs_top_srcdir=`cd $1 && cd $ac_top_srcdir && pwd`
 ])# _AC_SRCPATHS