diff --git a/ChangeLog b/ChangeLog
index d9b1ea34cf..2c5c49099f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-06-02  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* bits/shm.h (struct shmid_ds): Make shm_segsz field size_t instead of
+	int.
+	* sysdeps/gnu/bits/shm.h (struct shmid_ds): Likewise.
+
 2018-06-01  Leonardo Sandoval  <leonardo.sandoval.gonzalez@intel.com>
 
 	* benchtests/scripts/compare_string.py:	(process_results) Catch
diff --git a/bits/shm.h b/bits/shm.h
index 8e80be18e5..b739090105 100644
--- a/bits/shm.h
+++ b/bits/shm.h
@@ -44,7 +44,7 @@ typedef unsigned short int shmatt_t;
 struct shmid_ds
   {
     struct ipc_perm shm_perm;		/* operation permission struct */
-    int shm_segsz;			/* size of segment in bytes */
+    size_t shm_segsz;			/* size of segment in bytes */
     __time_t shm_atime;			/* time of last shmat() */
     __time_t shm_dtime;			/* time of last shmdt() */
     __time_t shm_ctime;			/* time of last change by shmctl() */
diff --git a/sysdeps/gnu/bits/shm.h b/sysdeps/gnu/bits/shm.h
index eef6729188..895c49b269 100644
--- a/sysdeps/gnu/bits/shm.h
+++ b/sysdeps/gnu/bits/shm.h
@@ -49,7 +49,7 @@ typedef unsigned short int shmatt_t;
 struct shmid_ds
   {
     struct ipc_perm shm_perm;		/* operation permission struct */
-    int shm_segsz;			/* size of segment in bytes */
+    size_t shm_segsz;			/* size of segment in bytes */
     __time_t shm_atime;			/* time of last shmat() */
     __time_t shm_dtime;			/* time of last shmdt() */
     __time_t shm_ctime;			/* time of last change by shmctl() */