diff --git a/man2/getrlimit.2 b/man2/getrlimit.2
index ec9dfcb92..af3a535f7 100644
--- a/man2/getrlimit.2
+++ b/man2/getrlimit.2
@@ -182,9 +182,14 @@ of the process's data segment (initialized data,
 uninitialized data, and heap).
 The limit is specified in bytes, and is rounded down to the system page size.
 This limit affects calls to
-.BR brk (2)
-and
+.BR brk (2),
 .BR sbrk (2),
+and as of Linux 4.7 also
+.BR mmap (2),
+.\" commits 84638335900f1995495838fe1bd4870c43ec1f67
+.\" ("mm: rework virtual memory accounting"),
+.\" f4fcd55841fc9e46daac553b39361572453c2b88
+.\" (mm: enable RLIMIT_DATA by default with workaround for valgrind).
 which fail with the error
 .B ENOMEM
 upon encountering the soft limit of this resource.
diff --git a/man2/mmap.2 b/man2/mmap.2
index df527809e..6db7c578c 100644
--- a/man2/mmap.2
+++ b/man2/mmap.2
@@ -493,6 +493,14 @@ when unmapping a region in the middle of an existing mapping,
 since this results in two smaller mappings on either side of
 the region being unmapped.
 .TP
+.B ENOMEM
+(since Linux 4.7)
+The process's
+.B RLIMIT_DATA
+limit, described in
+.BR getrlimit (2),
+would have been exceeded.
+.TP
 .B EOVERFLOW
 On 32-bit architecture together with the large file extension
 (i.e., using 64-bit
diff --git a/man3/malloc.3 b/man3/malloc.3
index d0e12fcfc..ac78662f7 100644
--- a/man3/malloc.3
+++ b/man3/malloc.3
@@ -292,7 +292,7 @@ Allocations performed using
 .BR mmap (2)
 are unaffected by the
 .B RLIMIT_DATA
-resource limit (see
+resource limit only prior to Linux kernel 4.7 (see
 .BR getrlimit (2)).
 .PP
 To avoid corruption in multithreaded applications,