diff --git a/ChangeLog b/ChangeLog
index c38984ae5..1f5f869dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-09  Loren James Rittle  <rittle@labs.mot.com>
+	
+	* configure.in: Add *-*-freebsd* configurations.
+
 2002-04-07  Andrew Cagney  <ac131313@redhat.com>
 
 	* Makefile.in (do-tar-bz2): Delete rule.  Replace with ...
diff --git a/configure.in b/configure.in
index 1b95fdf91..897495dd2 100644
--- a/configure.in
+++ b/configure.in
@@ -595,6 +595,9 @@ no)
 esac
 
 case "${target}" in
+  *-*-freebsd[12] | *-*-freebsd[12].* | *-*-freebsd*aout*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
+    ;;
   *-*-netbsd*)
     # Skip some stuff on all NetBSD configurations.
     skipdirs="$skipdirs target-newlib target-libiberty target-libgloss"
@@ -624,6 +627,9 @@ case "${target}" in
   alpha*-*-*vms*)
     noconfigdirs="$noconfigdirs gdb ld target-newlib target-libgloss target-libffi"
     ;;
+  alpha*-*-freebsd*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
   alpha*-*-*)
     # newlib is not 64 bit ready
     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
@@ -744,6 +750,9 @@ case "${target}" in
          target_configdirs="${target_configdirs} target-libstub target-cygmon"
     fi
     ;;
+  i[34567]86-*-freebsd*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
   i[3456]86-*-go32* | i[3456]-*-msdosdjgpp*)
     # but don't build gdb
     noconfigdirs="$noconfigdirs gdb ${libstdcxx_version} target-libffi"