diff --git a/ChangeLog b/ChangeLog
index adab14f08001..65dc3d453fd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-02  Hans-Peter Nilsson  <hp@axis.com>
+
+	* configure.ac: Enable fortran for cris-*-elf and crisv32-*-elf.
+	* configure: Regenerate.
+
 2008-01-31  Marc Gauthier  <marc@tensilica.com>
 
 	* configure.ac (xtensa*-*-*): Recognize processor variants.
diff --git a/configure b/configure
index 15406285fc8e..ce114351da97 100755
--- a/configure
+++ b/configure
@@ -2298,7 +2298,6 @@ case "${target}" in
 	unsupported_languages="$unsupported_languages fortran"
 	noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
       *-*-elf)
-	unsupported_languages="$unsupported_languages fortran"
 	noconfigdirs="$noconfigdirs target-boehm-gc";;
       *-*-linux*)
 	noconfigdirs="$noconfigdirs target-newlib target-libgloss";;
diff --git a/configure.ac b/configure.ac
index 56d7f12d374a..315fa3bd8012 100644
--- a/configure.ac
+++ b/configure.ac
@@ -575,7 +575,6 @@ case "${target}" in
 	unsupported_languages="$unsupported_languages fortran"
 	noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
       *-*-elf)
-	unsupported_languages="$unsupported_languages fortran"
 	noconfigdirs="$noconfigdirs target-boehm-gc";;
       *-*-linux*)
 	noconfigdirs="$noconfigdirs target-newlib target-libgloss";;