diff --git a/ChangeLog b/ChangeLog
index bd1f1cb57..c45de9a0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-23  Adam Fedor  <fedor@gnu.org>
+
+	* Source/NSObject.m ([NSObject +initialize]): Apply BSD FPU fix
+	only on x86 machines.
+
 2007-01-23  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/win32/NSMessagePortNameServerWin32.m:
diff --git a/Source/NSObject.m b/Source/NSObject.m
index 818d4e17b..dc5c99dc3 100644
--- a/Source/NSObject.m
+++ b/Source/NSObject.m
@@ -941,9 +941,10 @@ GSDescriptionForClassMethod(pcl self, SEL aSel)
 #endif
 #endif
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && defined(__i386__)
       // Manipulate the FPU to add the exception mask. (Fixes SIGFPE
       // problems on *BSD)
+      // Note this only works on x86
 
       {
 	volatile short cw;