diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3d6f0f51d28e765c509921d4c738907906f444f8..6846f9b2af7aa4c6fccbb1c2eedc97773d198465 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-04  Matthias Klose  <doko@ubuntu.com>
+
+	PR libgcj/33278
+	* configure.ac: Robustify extraction of gcj version.
+	* configure: Regenerate.
+
 2007-09-04  Andrew Haley  <aph@redhat.com>
 
 	PR java/27908
diff --git a/libjava/configure b/libjava/configure
index 2a147242b48f17b2fd7fe22387150b1e158dbfa3..89e5fff58df2ab900bf43072288c6396b092ce97 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -26188,7 +26188,7 @@ esac
 
 
 # Determine gcj and libgcj version number.
-gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([^ ]*\).*$/\1/p'`
+gcjversion=`cat "$srcdir/../gcc/BASE-VER"`
 libgcj_soversion=`awk -F: '/^[^#].*:/ { print $1 }' $srcdir/libtool-version`
 GCJVERSION=$gcjversion
 
diff --git a/libjava/configure.ac b/libjava/configure.ac
index 134c054815b568ebd57298f2d2112b8e22be21be..e1fada2eddfddf8531e1019a072674acc2ea1b0b 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -1381,7 +1381,7 @@ AC_SUBST(toolexecmainlibdir)
 AC_SUBST(toolexeclibdir)
 
 # Determine gcj and libgcj version number.
-gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([[^ ]]*\).*$/\1/p'`
+gcjversion=`cat "$srcdir/../gcc/BASE-VER"`
 libgcj_soversion=`awk -F: '/^[[^#]].*:/ { print $1 }' $srcdir/libtool-version`
 GCJVERSION=$gcjversion
 AC_SUBST(GCJVERSION)