diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e4131a87113..77c4d550924 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-30  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* config/m68k/netbsd-elf.h (LONG_DOUBLE_TYPE_SIZE): Compute
+	at run-time.
+	(LIBGCC2_LONG_DOUBLE_TYPE_SIZE): Set to 96 if not __mc68010__.
+
 2002-05-30  Aldy Hernandez  <aldyh@redhat.com>
 
         * config/rs6000/rs6000.c (rs6000_expand_unop_builtin): Return
diff --git a/gcc/config/m68k/netbsd-elf.h b/gcc/config/m68k/netbsd-elf.h
index c2d7fc0bdc5..6d36d2e794a 100644
--- a/gcc/config/m68k/netbsd-elf.h
+++ b/gcc/config/m68k/netbsd-elf.h
@@ -42,13 +42,15 @@ Boston, MA 02111-1307, USA.  */
 
 
 /* Don't try using XFmode on the 68010.  */ 
-#if TARGET_DEFAULT == 0
 #undef LONG_DOUBLE_TYPE_SIZE
-#define LONG_DOUBLE_TYPE_SIZE 64
-#endif
+#define LONG_DOUBLE_TYPE_SIZE			\
+  ((TARGET_68020 || TARGET_68040 || TARGET_68040_ONLY || \
+    TARGET_68060) ? 96 : 64)
 
 #ifdef __mc68010__
 #define LIBGCC2_LONG_DOUBLE_TYPE_SIZE 64
+#else
+#define LIBGCC2_LONG_DOUBLE_TYPE_SIZE 96
 #endif
 
 #define EXTRA_SPECS \