diff --git a/ChangeLog b/ChangeLog
index 23beb8637..ea2ed485b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-02  Mirko Viviani  <mirko.viviani@rccr.cremona.it>
+
+	* Source/NSObject.m ([NSObject +initialize]): fixed a FreeBSD specific
+	code bug introduced by the call of GSSetLocaleC().
+
 Wed May  2 13:19:13 2001  Nicola Pero  <nicola@brainstorm.co.uk>
 
 	* Source/UnixFileHandle.m (id): Redefine `id' when including
diff --git a/Source/NSObject.m b/Source/NSObject.m
index c45a5a7ff..74441d165 100644
--- a/Source/NSObject.m
+++ b/Source/NSObject.m
@@ -585,11 +585,13 @@ static BOOL double_release_check_enabled = NO;
       // Manipulate the FPU to add the exception mask. (Fixes SIGFPE
       // problems on *BSD)
 
-      volatile short cw;
+      {
+	volatile short cw;
 
-      __asm__ volatile ("fstcw (%0)" : : "g" (&cw));
-      cw |= 1; /* Mask 'invalid' exception */
-      __asm__ volatile ("fldcw (%0)" : : "g" (&cw));
+	__asm__ volatile ("fstcw (%0)" : : "g" (&cw));
+	cw |= 1; /* Mask 'invalid' exception */
+	__asm__ volatile ("fldcw (%0)" : : "g" (&cw));
+      }
 #endif
 
       // Create the global lock