diff --git a/ChangeLog b/ChangeLog
index 65651980d..fdfa5c92d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-16  Jie Zhang  <jie.zhang@analog.com>
+
+	* configure.ac: Disable java and boehm-gc for bfin-*-*.
+	* configure: Regenerate.
+
 2009-09-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* configure.ac: Do not use $extrasub for replacing @if/@endif
diff --git a/configure b/configure
index aa1662c88..611998330 100755
--- a/configure
+++ b/configure
@@ -3120,7 +3120,8 @@ case "${target}" in
     noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj} target-libssp"
     ;;
   bfin-*-*)
-    noconfigdirs="$noconfigdirs gdb"
+    unsupported_languages="$unsupported_languages java"
+    noconfigdirs="$noconfigdirs target-boehm-gc gdb"
     if test x${is_cross_compiler} != xno ; then
       target_configdirs="${target_configdirs} target-bsp target-cygmon"
     fi
diff --git a/configure.ac b/configure.ac
index a85c3bd35..f3d511973 100644
--- a/configure.ac
+++ b/configure.ac
@@ -603,7 +603,8 @@ case "${target}" in
     noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj} target-libssp"
     ;;
   bfin-*-*)
-    noconfigdirs="$noconfigdirs gdb"
+    unsupported_languages="$unsupported_languages java"
+    noconfigdirs="$noconfigdirs target-boehm-gc gdb"
     if test x${is_cross_compiler} != xno ; then
       target_configdirs="${target_configdirs} target-bsp target-cygmon"
     fi