diff --git a/sys/arch/pc532/conf/files.pc532 b/sys/arch/pc532/conf/files.pc532
index a87b9f891656..17e82265209a 100644
--- a/sys/arch/pc532/conf/files.pc532
+++ b/sys/arch/pc532/conf/files.pc532
@@ -1,4 +1,4 @@
-#	$NetBSD: files.pc532,v 1.48 2002/09/06 13:18:43 gehenna Exp $
+#	$NetBSD: files.pc532,v 1.49 2003/06/24 02:48:56 thorpej Exp $
 #
 # new style config file for pc532 architecture
 #
@@ -39,6 +39,7 @@ file	arch/pc532/dev/ncr.c		ncr needs-flag
 #attach	aic at mainbus
 #file	arch/pc532/dev/aic.c		aic needs-flag
 
+defflag	NS381
 file	arch/pc532/fpu/ieee_dze.c
 file	arch/pc532/fpu/ieee_handler.c
 file	arch/pc532/fpu/ieee_invop.c
diff --git a/sys/arch/pc532/pc532/locore.s b/sys/arch/pc532/pc532/locore.s
index 1d3ecd6e0fd1..18f1eb0591e5 100644
--- a/sys/arch/pc532/pc532/locore.s
+++ b/sys/arch/pc532/pc532/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.70 2003/06/23 13:06:56 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.71 2003/06/24 02:48:58 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1993 Philip A. Nelson.
@@ -42,6 +42,7 @@
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
+#include "opt_ns381.h"
 
 #include "assym.h"
 
diff --git a/sys/arch/pc532/pc532/machdep.c b/sys/arch/pc532/pc532/machdep.c
index f3f7b96a3eec..f1f649b5f30f 100644
--- a/sys/arch/pc532/pc532/machdep.c
+++ b/sys/arch/pc532/pc532/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.141 2003/06/23 13:06:56 thorpej Exp $	*/
+/*	$NetBSD: machdep.c,v 1.142 2003/06/24 02:48:58 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 Matthias Pfaller.
@@ -45,6 +45,7 @@
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_compat_netbsd.h"
+#include "opt_ns381.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arch/pc532/pc532/trap.c b/sys/arch/pc532/pc532/trap.c
index 1977cdd02de0..f15893ce2c32 100644
--- a/sys/arch/pc532/pc532/trap.c
+++ b/sys/arch/pc532/pc532/trap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.52 2003/06/23 13:06:58 thorpej Exp $	*/
+/*	$NetBSD: trap.c,v 1.53 2003/06/24 02:48:59 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 Matthias Pfaller. All rights reserved.
@@ -49,7 +49,7 @@
 #include "opt_syscall_debug.h"
 #include "opt_ktrace.h"
 #include "opt_systrace.h"
-#include "opt_math_emulate.h"
+#include "opt_ns381.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -275,7 +275,7 @@ trap(frame)
 #ifndef NS381
 		extern int _have_fpu;
 		if (!_have_fpu) {
-# ifdef MATH_EMULATE
+# if 0 /* XXX Glue in softfloat here */
 			int rv;
 			if ((rv = math_emulate(&frame)) == 0) {
 				if (frame.tf_psr & PSL_T) {