diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e31a214d462..87d1b9adea3 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-22  Tom Tromey  <tromey@redhat.com>
+
+	* configure: Rebuilt.
+	* configure.ac (GCJ): Reverted patch of 2006-12-20.
+
 2007-01-22  Tom Tromey  <tromey@redhat.com>
 
 	PR java/29812:
diff --git a/libjava/configure b/libjava/configure
index 9b550a2ca0d..6b4dc629a78 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -5145,7 +5145,7 @@ case "${which_gcj}" in
          GCC_UNWIND_INCLUDE=
          GCJ="${target_noncanonical}-gcj"
       else
-         GCJ="$built_gcc_dir/gcj -B$built_gcc_dir/"
+         GCJ="${target_noncanonical}-gcj -B`${PWDCMD-pwd}`/"
       fi
       GCJH="$built_gcc_dir/gcjh"
    ;;
diff --git a/libjava/configure.ac b/libjava/configure.ac
index baef81de3f2..1adc82f1576 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -344,7 +344,7 @@ case "${which_gcj}" in
          GCC_UNWIND_INCLUDE=
          GCJ="${target_noncanonical}-gcj"
       else
-         GCJ="$built_gcc_dir/gcj -B$built_gcc_dir/"
+         GCJ="${target_noncanonical}-gcj -B`${PWDCMD-pwd}`/"
       fi
       GCJH="$built_gcc_dir/gcjh"
    ;;