diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 20680cd5009..16b0f84553d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-28  David O'Brien  <obrien@FreeBSD.org>
+
+	* config.gcc (sparc64-*-freebsd): Explicitly accept a cpu specification
+	of "ultrasparc".
+	* config/sparc/freebsd.h: Do not use MASK_FASTER_STRUCTS.  It appears
+	to be broken.
+
 2002-02-28  Richard Henderson  <rth@redhat.com>
 
 	* config/ia64/ia64.c (ia64_adjust_cost): All non-MM consumers have
diff --git a/gcc/config.gcc b/gcc/config.gcc
index a7a9922905e..597e1f8fe26 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -3229,6 +3229,7 @@ sparc64-*-freebsd*|ultrasparc-*-freebsd*)
 	tm_file="${tm_file} ${fbsd_tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/freebsd.h"
 	xmake_file=none
 	case "x$with_cpu" in
+		xultrasparc) ;;
 		x) with_cpu=ultrasparc ;;
 		*) echo "$with_cpu not supported for freebsd target"; exit 1 ;;
 	esac
diff --git a/gcc/config/sparc/freebsd.h b/gcc/config/sparc/freebsd.h
index b0992fab025..61a61d40d3e 100644
--- a/gcc/config/sparc/freebsd.h
+++ b/gcc/config/sparc/freebsd.h
@@ -91,7 +91,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #undef  TARGET_DEFAULT
 #define TARGET_DEFAULT \
-  (MASK_V9 + MASK_64BIT + MASK_PTR64 + MASK_FASTER_STRUCTS \
+  (MASK_V9 + MASK_64BIT + MASK_PTR64 /* + MASK_FASTER_STRUCTS */ \
    + MASK_STACK_BIAS + MASK_APP_REGS + MASK_EPILOGUE + MASK_FPU \
    + MASK_LONG_DOUBLE_128 /* + MASK_HARD_QUAD */)