diff --git a/ChangeLog b/ChangeLog
index 52507ca721..afe5501aa0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysvipc/sys/msg.h (msgbuf): Replace long int with
+	__syscall_slong_t.
+
 2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/unix/sysv/linux/x86_64/sys/reg.h: Don't
diff --git a/sysvipc/sys/msg.h b/sysvipc/sys/msg.h
index 4c8d62cbf7..0dd98991a0 100644
--- a/sysvipc/sys/msg.h
+++ b/sysvipc/sys/msg.h
@@ -51,7 +51,7 @@ typedef __ssize_t ssize_t;
 /* Template for struct to be used as argument for `msgsnd' and `msgrcv'.  */
 struct msgbuf
   {
-    long int mtype;		/* type of received/sent message */
+    __syscall_slong_t mtype;	/* type of received/sent message */
     char mtext[1];		/* text of the message */
   };
 #endif