diff --git a/man2/mmap.2 b/man2/mmap.2
index 656293d06..5e6e353b3 100644
--- a/man2/mmap.2
+++ b/man2/mmap.2
@@ -35,10 +35,9 @@
 .\" Modified 2004-12-08, mtk, formatting tidy-ups
 .\" Modified 2006-12-04, mtk, various parts rewritten
 .\" 2007-07-10, mtk, Added an example program.
-.\" FIXME . We may eventually get MAP_STACK; see
-.\"     http://lwn.net/Articles/294642 "Tangled up in threads", 19 Aug 08
+.\" 2008-11-18, mtk, document MAP_STACK
 .\"
-.TH MMAP 2 2008-06-05 "Linux" "Linux Programmer's Manual"
+.TH MMAP 2 2008-11-18 "Linux" "Linux Programmer's Manual"
 .SH NAME
 mmap, munmap \- map or unmap files or devices into memory
 .SH SYNOPSIS
@@ -275,6 +274,20 @@ However, most systems also support
 .B MAP_ANONYMOUS
 (or its synonym
 .BR MAP_ANON ).
+.TP
+.BR MAP_STACK " (since Linux 2.6.27)"
+Allocate the mapping at an address suitable for a process
+or thread stack.
+This flag is currently a no-op,
+but is used in the glibc threading implementation so that
+if some architectures require special treatment for stack allocations,
+support can later be transparently implemented for glibc.
+.\" FIXME . We may eventually get MAP_STACK; see
+.\"     http://lwn.net/Articles/294642 "Tangled up in threads", 19 Aug 08
+.\" commit cd98a04a59e2f94fa64d5bf1e26498d27427d5e7
+.\" http://thread.gmane.org/gmane.linux.kernel/720412
+.\" "pthread_create() slow for many threads; also time to revisit 64b
+.\"  context switch optimization?"
 .LP
 Some systems document the additional flags
 .BR MAP_AUTOGROW ,