diff --git a/ChangeLog b/ChangeLog
index f6b7c2bbed..295f499bf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,12 @@
 	(libc_fesetenv, libc_fesetenvf, libc_fesetenvl): Remove.
 	(libc_feupdateenv, libc_feupdateenvf, libc_feupdateenvf): Remove.
 
+2012-03-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/x86_64/fpu/math_private.h (EXTRACT_WORDS64): Use
+	int64_t instead of long int.
+	(INSERT_WORDS64): Likwise.
+
 2012-03-19  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/x86_64/jmpbuf-unwind.h (_JMPBUF_CFA_UNWINDS_ADJ): Cast
diff --git a/sysdeps/x86_64/fpu/math_private.h b/sysdeps/x86_64/fpu/math_private.h
index 67c5f6a324..63a699e8fc 100644
--- a/sysdeps/x86_64/fpu/math_private.h
+++ b/sysdeps/x86_64/fpu/math_private.h
@@ -12,7 +12,7 @@
 /* Direct movement of float into integer register.  */
 #define EXTRACT_WORDS64(i, d)						      \
   do {									      \
-    long int i_;							      \
+    int64_t i_;								      \
     asm (MOVD " %1, %0" : "=rm" (i_) : "x" ((double) (d)));		      \
     (i) = i_;								      \
   } while (0)
@@ -20,7 +20,7 @@
 /* And the reverse.  */
 #define INSERT_WORDS64(d, i) \
   do {									      \
-    long int i_ = i;							      \
+    int64_t i_ = i;							      \
     double d__;								      \
     asm (MOVD " %1, %0" : "=x" (d__) : "rm" (i_));			      \
     d = d__;								      \