diff --git a/ChangeLog b/ChangeLog
index a10b8c43e2..7a785c450d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-04-07  Florian Weimer  <fweimer@redhat.com>
+
+	* malloc/scratch_buffer_set_array_size.c: Include <limits.h>.
+
 2016-04-06   H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S
diff --git a/malloc/scratch_buffer_set_array_size.c b/malloc/scratch_buffer_set_array_size.c
index 3d33731abb..9254c9ae7b 100644
--- a/malloc/scratch_buffer_set_array_size.c
+++ b/malloc/scratch_buffer_set_array_size.c
@@ -18,6 +18,7 @@
 
 #include <scratch_buffer.h>
 #include <errno.h>
+#include <limits.h>
 
 bool
 __libc_scratch_buffer_set_array_size (struct scratch_buffer *buffer,