diff --git a/ChangeLog b/ChangeLog
index 3691d63a8..16b030d47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-03  Adam Fedor <fedor@gnu.org>
+
+	* Source/NSObject.m: Revert previous patch (David to fix up later).
+
 2009-03-31  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Headers/Foundation/NSInvocation.h:
diff --git a/Source/NSObject.m b/Source/NSObject.m
index 89f6071df..8e6cf56ab 100644
--- a/Source/NSObject.m
+++ b/Source/NSObject.m
@@ -907,9 +907,9 @@ warn_proc(char *msg, GC_word arg)
       {
 	volatile short cw;
 
-	__asm__ volatile ("fstcw %0" : : "g" (&cw));
+	__asm__ volatile ("fstcw (%0)" : : "g" (&cw));
 	cw |= 1; /* Mask 'invalid' exception */
-	__asm__ volatile ("fldcw %0" : : "g" (&cw));
+	__asm__ volatile ("fldcw (%0)" : : "g" (&cw));
       }
 #endif