diff --git a/AUTHORS b/AUTHORS
index 8a170b5..ff2a5f4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,6 +5,8 @@
 #   Name/Organization <email address>
 
 Google Inc.
+Mozilla Foundation
 
 Jeff Muizelaar <jmuizelaar@mozilla.com>
+Mike Hommey <mhommey@mozilla.com>
 Martin Olsson <mnemo@minimum.se>
diff --git a/src/utils.h b/src/utils.h
index cd3e330..767094b 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -53,10 +53,14 @@
 // disabled.)
 // On Linux,x86 89255e-22 != Div_double(89255.0/1e22)
 #if defined(_M_X64) || defined(__x86_64__) || \
-    defined(__ARMEL__) || \
+    defined(__ARMEL__) || defined(__avr32__) || \
+    defined(__hppa__) || defined(__ia64__) || \
+    defined(__mips__) || defined(__powerpc__) || \
+    defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
+    defined(__SH4__) || defined(__alpha__) || \
     defined(_MIPS_ARCH_MIPS32R2)
 #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
-#elif defined(_M_IX86) || defined(__i386__)
+#elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
 #if defined(_WIN32)
 // Windows uses a 64bit wide floating point stack.
 #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1