--- numpy/core/include/numpy/ufuncobject.h.orig	2009-08-03 22:20:02 -0400
+++ numpy/core/include/numpy/ufuncobject.h	2009-08-03 22:20:57 -0400
@@ -318,9 +318,9 @@
 
 #elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
 
-#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || defined(__FreeBSD__)
+#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__)
 #include <fenv.h>
-#elif defined(__CYGWIN__)
+#elif defined(__CYGWIN__) || defined(__FreeBSD__)
 #include "fenv/fenv.c"
 #endif
 
--- numpy/numarray/_capi.c.orig	2009-08-03 22:21:28 -0400
+++ numpy/numarray/_capi.c	2009-08-03 22:22:05 -0400
@@ -8,9 +8,9 @@
 #include <sys/param.h>
 #endif
 
-#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
+#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__)
 #include <fenv.h>
-#elif defined(__CYGWIN__)
+#elif defined(__CYGWIN__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
 #include "numpy/fenv/fenv.h"
 #include "numpy/fenv/fenv.c"
 #endif
--- numpy/core/setup.py.orig	2009-08-03 22:39:11 -0400
+++ numpy/core/setup.py	2009-08-03 22:43:38 -0400
@@ -460,7 +460,7 @@
             ]
 
     # Don't install fenv unless we need them.
-    if sys.platform == 'cygwin':
+    if sys.platform == 'cygwin' or sys.platform.startswith('freebsd'):
         config.add_data_dir('include/numpy/fenv')
 
     config.add_extension('_sort',