diff --git a/sys/arch/arm/include/Makefile b/sys/arch/arm/include/Makefile
index 4dcf1b7145d2..cfb48ffd1f44 100644
--- a/sys/arch/arm/include/Makefile
+++ b/sys/arch/arm/include/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.44 2013/01/11 14:09:55 matt Exp $
+#	$NetBSD: Makefile,v 1.45 2013/04/23 05:42:23 matt Exp $
 
 INCSDIR= /usr/include/arm
 
@@ -7,7 +7,7 @@ INCS=	aeabi.h ansi.h aout_machdep.h armreg.h asm.h atomic.h \
 	cdefs.h cpu.h cpuconf.h \
 	disklabel.h \
 	elf_machdep.h endian.h endian_machdep.h \
-	float.h frame.h \
+	fenv.h float.h frame.h \
 	ieee.h ieeefp.h \
 	int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
 	kcore.h \
diff --git a/sys/arch/arm/include/ieeefp.h b/sys/arch/arm/include/ieeefp.h
index 08d0ef17acfc..1c330686dac2 100644
--- a/sys/arch/arm/include/ieeefp.h
+++ b/sys/arch/arm/include/ieeefp.h
@@ -1,32 +1,18 @@
-/*	$NetBSD: ieeefp.h,v 1.2 2008/08/05 16:47:41 matt Exp $	*/
+/*	$NetBSD: ieeefp.h,v 1.3 2013/04/23 05:42:23 matt Exp $	*/
 
 /* 
  * Based on ieeefp.h written by J.T. Conklin, Apr 28, 1995
  * Public domain.
  */
 
-#ifndef _ARM32_IEEEFP_H_
-#define _ARM32_IEEEFP_H_
+#ifndef _ARM_IEEEFP_H_
+#define _ARM_IEEEFP_H_
 
 #include <sys/featuretest.h>
 
 #if defined(_NETBSD_SOURCE) || defined(_ISOC99_SOURCE)
 
-typedef int fenv_t;
-typedef int fexcept_t;
-
-#define	FE_INVALID	0x01	/* invalid operation exception */
-#define	FE_DIVBYZERO	0x02	/* divide-by-zero exception */
-#define	FE_OVERFLOW	0x04	/* overflow exception */
-#define	FE_UNDERFLOW	0x08	/* underflow exception */
-#define	FE_INEXACT	0x10	/* imprecise (loss of precision; "inexact") */
-
-#define	FE_ALL_EXCEPT	0x1f
-
-#define	FE_TONEAREST	0	/* round to nearest representable number */
-#define	FE_UPWARD	1	/* round toward positive infinity */
-#define	FE_DOWNWARD	2	/* round toward negative infinity */
-#define	FE_TOWARDZERO	3	/* round to zero (truncate) */
+#include <arm/fenv.h>
 
 #if !defined(_ISOC99_SOURCE)
 
@@ -55,4 +41,4 @@ typedef enum {
 
 #endif /* _NETBSD_SOURCE || _ISOC99_SOURCE */
 
-#endif /* _ARM32_IEEEFP_H_ */
+#endif /* _ARM_IEEEFP_H_ */