diff --git a/man2/execve.2 b/man2/execve.2
index 0a6a7957c..d6dc9391b 100644
--- a/man2/execve.2
+++ b/man2/execve.2
@@ -186,7 +186,7 @@ file has an SUID or SGID bit set.
 Executable was open for writing by one or more processes.
 .SH "CONFORMING TO"
 SVr4, 4.3BSD, POSIX.1-2001.  
-POSIX.1 does not document the #!  behavior
+POSIX.1-2001 does not document the #!  behavior
 but is otherwise compatible.  
 .\" SVr4 documents additional error
 .\" conditions EAGAIN, EINTR, ELIBACC, ENOLINK, EMULTIHOP; POSIX does not
diff --git a/man2/fcntl.2 b/man2/fcntl.2
index 78a947fb1..5d0ef44d8 100644
--- a/man2/fcntl.2
+++ b/man2/fcntl.2
@@ -537,7 +537,7 @@ with
 .B O_NONBLOCK
 set etc.) to determine which file descriptors are available for I/O.
 .sp
-By selecting a POSIX.1b real time signal (value >= SIGRTMIN), multiple
+By selecting a real time signal (value >= SIGRTMIN), multiple
 I/O events may be queued using the same signal numbers.  (Queuing is
 dependent on available memory).  Extra information is available
 if SA_SIGINFO is set for the signal handler, as above.
@@ -771,7 +771,7 @@ on multiple directories).
 .sp
 Especially when using
 .BR DN_MULTISHOT ,
-a POSIX.1b real time signal should be used for notification,
+a real time signal should be used for notification,
 so that multiple notifications can be queued.
 
 .B NOTE:
@@ -933,7 +933,7 @@ and signals will be sent to the owner.
 SVr4, 4.3BSD, POSIX.1-2001.  
 Only the operations F_DUPFD,
 F_GETFD, F_SETFD, F_GETFL, F_SETFL, F_GETLK, F_SETLK, F_SETLKW, 
-F_GETOWN, and F_SETOWN are specified in POSIX.1.
+F_GETOWN, and F_SETOWN are specified in POSIX.1-2001.
 
 F_GETSIG, F_SETSIG, F_NOTIFY, F_GETLEASE, and F_SETLEASE
 are Linux specific.
diff --git a/man2/getitimer.2 b/man2/getitimer.2
index 9cd1daf6e..aa88456a4 100644
--- a/man2/getitimer.2
+++ b/man2/getitimer.2
@@ -168,7 +168,7 @@ This bug is fixed in kernel 2.6.12.
 .\" 4 Jul 2005: It looks like this bug may remain in 2.4.x.
 .\"	http://lkml.org/lkml/2005/7/1/165
 
-POSIX.1 says that
+POSIX.1-2001 says that
 .BR setitimer ()
 should fail if a
 .I tv_usec
diff --git a/man2/mmap.2 b/man2/mmap.2
index a8be8cedf..abbbe4dc1 100644
--- a/man2/mmap.2
+++ b/man2/mmap.2
@@ -126,7 +126,7 @@ You must specify exactly one of
 and 
 .BR MAP_PRIVATE .
 .LP
-The above three flags are described in POSIX.1b and SUSv2.
+The above three flags are described in POSIX.1-2001.
 Linux also knows about the following non-standard flags:
 .TP
 .B MAP_DENYWRITE
diff --git a/man2/sched_get_priority_max.2 b/man2/sched_get_priority_max.2
index 4d440d1fe..330ff3985 100644
--- a/man2/sched_get_priority_max.2
+++ b/man2/sched_get_priority_max.2
@@ -68,7 +68,7 @@ The range of scheduling priorities may vary on other POSIX systems,
 thus it is a good idea for portable applications to use a virtual
 priority range and map it to the interval given by
 \fBsched_get_priority_max\fR() and \fBsched_get_priority_min\fR().
-POSIX.1b requires a spread of at least 32 between the maximum and the
+POSIX.1-2001 requires a spread of at least 32 between the maximum and the
 minimum values for \fISCHED_FIFO\fR and \fISCHED_RR\fR.
 
 POSIX systems on which
diff --git a/man2/sched_setscheduler.2 b/man2/sched_setscheduler.2
index 277ec9c66..ed2574f3e 100644
--- a/man2/sched_setscheduler.2
+++ b/man2/sched_setscheduler.2
@@ -104,7 +104,7 @@ Processes scheduled under \fISCHED_FIFO\fP or
 The system calls \fBsched_get_priority_min\fP() and
 \fBsched_get_priority_max\fP() can be used to find out the valid
 priority range for a scheduling policy in a portable way on all
-POSIX.1b conforming systems.
+POSIX.1-2001 conforming systems.
 
 All scheduling is preemptive: If a process with a higher static
 priority gets ready to run, the current process will be preempted and
@@ -129,7 +129,7 @@ will be inserted at the end of the list for its priority. A call to
 \fIpid\fP at the start of the list if it was runnable.
 As a consequence, it may preempt the currently running process if
 it has the same priority.
-(POSIX.1 specifies that the process should go to the end
+(POSIX.1-2001 specifies that the process should go to the end
 of the list.)
 .\" In 2.2.x and 2.4.x, the process is placed at the front of the queue
 .\" In 2.0.x, the Right Thing happened: the process went to the back -- MTK
diff --git a/man2/semget.2 b/man2/semget.2
index dbcc4e56c..94a462f44 100644
--- a/man2/semget.2
+++ b/man2/semget.2
@@ -99,7 +99,7 @@ not meaningful for semaphores, and write permissions mean permission
 to alter semaphore values).
 .PP
 The values of the semaphores in a newly created set are indeterminate.
-(POSIX.1 is explicit on this point.)  
+(POSIX.1-2001 is explicit on this point.)  
 Although Linux, like many other implementations,
 initialises the semaphore values to 0,
 a portable application cannot rely on this:
diff --git a/man2/sendfile.2 b/man2/sendfile.2
index ce68236a1..748a9870e 100644
--- a/man2/sendfile.2
+++ b/man2/sendfile.2
@@ -148,6 +148,8 @@ Insufficient memory to read from
 .BR sendfile ()
 is a new feature in Linux 2.2.
 The include file <sys/sendfile.h> is present since glibc2.1.
+.SH "CONFORMING TO"
+Not specified in POSIX.1-2001, or other standards.
 
 Other Unix systems implement 
 .BR sendfile ()
diff --git a/man2/set_tid_address.2 b/man2/set_tid_address.2
index e4a95db59..e7fc5fdfc 100644
--- a/man2/set_tid_address.2
+++ b/man2/set_tid_address.2
@@ -83,6 +83,8 @@ returns the PID of the current process.
 .SH HISTORY
 This call is present since Linux 2.5.48.
 Details as given here are valid since Linux 2.5.49.
+.SH "CONFORMING TO"
+This system call is Linux specific.
 .SH "SEE ALSO"
 .BR clone (2),
 .BR futex (2)
diff --git a/man2/shutdown.2 b/man2/shutdown.2
index 6d0850e33..6d7595337 100644
--- a/man2/shutdown.2
+++ b/man2/shutdown.2
@@ -83,7 +83,7 @@ respectively, and are defined in
 .I <sys/socket.h>
 since glibc-2.1.91.
 .SH "CONFORMING TO"
-4.4BSD (the
+POSIX.1-2001, 4.4BSD (the
 .BR shutdown ()
 function call first appeared in 4.2BSD).
 .SH "SEE ALSO"
diff --git a/man2/stat.2 b/man2/stat.2
index 23a7fae41..90666b483 100644
--- a/man2/stat.2
+++ b/man2/stat.2
@@ -306,7 +306,7 @@ Out of memory (i.e. kernel memory).
 .B ENOTDIR
 A component of the path is not a directory.
 .SH "CONFORMING TO"
-calls conform to SVr4, 4.3BSD, POSIX.1-2001.
+These system calls conform to SVr4, 4.3BSD, POSIX.1-2001.
 .\" SVr4 documents additional
 .\" .BR fstat ()
 .\" error conditions EINTR, ENOLINK, and EOVERFLOW.  SVr4
diff --git a/man3/argz_add.3 b/man3/argz_add.3
index 2622c0cd1..4828db47e 100644
--- a/man3/argz_add.3
+++ b/man3/argz_add.3
@@ -202,7 +202,7 @@ All argz functions that do memory allocation have a return type of
 if an allocation error occurs.
 .SH BUGS
 Argz vectors without a terminating null byte may lead to Segmentation Faults.
-.SH NOTES
+.SH CONFORMINT TO
 These functions are a GNU extension. Handle with care.
 .SH "SEE ALSO"
 .BR envz (3)
diff --git a/man3/asprintf.3 b/man3/asprintf.3
index 897d0ee26..e55ba18e1 100644
--- a/man3/asprintf.3
+++ b/man3/asprintf.3
@@ -56,7 +56,7 @@ If memory allocation wasn't possible, or some other error occurs,
 these functions will return \-1, and the contents of
 .I strp
 is undefined.
-.SH NOTES
+.SH CONFORMING TO
 These functions are GNU extensions, not in C or POSIX.
 They are also available under *BSD.
 The FreeBSD implementation sets
diff --git a/man3/atexit.3 b/man3/atexit.3
index 06c067de0..434aa301f 100644
--- a/man3/atexit.3
+++ b/man3/atexit.3
@@ -45,7 +45,7 @@ or via return from the program's \fImain\fP().
 Functions so registered are called in
 the reverse order of their registration; no arguments are passed.
 .LP
-POSIX.1 requires that an implementation allow at least ATEXIT_MAX (32) 
+POSIX.1-2001 requires that an implementation allow at least ATEXIT_MAX (32)
 such functions to be registered.
 The actual limit supported by an implementation can be obtained using
 .BR sysconf (3).
diff --git a/man3/cmsg.3 b/man3/cmsg.3
index f39c9ab38..0046cb4e2 100644
--- a/man3/cmsg.3
+++ b/man3/cmsg.3
@@ -204,9 +204,9 @@ and
 are constant expressions (assuming their argument is constant);
 this could be used to declare the size of global
 variables. This may be not portable, however.
-.SH "CONFORMS TO"
-This ancillary data model conforms to the POSIX.1003.1g draft, 4.4BSD-Lite,
-the IPv6 advanced API described in RFC\ 2292 and the Single Unix specification v2.
+.SH "CONFORMING TO"
+This ancillary data model conforms to the POSIX.1g draft, 4.4BSD-Lite,
+the IPv6 advanced API described in RFC\ 2292 and the SUSv2.
 .B
 CMSG_ALIGN 
 is a Linux extension. 
diff --git a/man3/daemon.3 b/man3/daemon.3
index 14eb39e34..a59911e96 100644
--- a/man3/daemon.3
+++ b/man3/daemon.3
@@ -82,7 +82,9 @@ exists but is not a character device with the expected
 major and minor numbers. In this case
 .I errno
 need not be set.
-.SH HISTORY
+.SH CONFORMING TO
+Not in POSIX.1-2001.
+A similar function appears on the BSDs.
 The
 .BR daemon ()
 function first appeared in 4.4BSD.
diff --git a/man3/des_crypt.3 b/man3/des_crypt.3
index f23c8843c..c4a5f2292 100644
--- a/man3/des_crypt.3
+++ b/man3/des_crypt.3
@@ -130,3 +130,6 @@ is false only for the first two statuses.
 .SH AVAILABILITY
 These routines are present in libc 4.6.27 and later, and in
 glibc 2.1 and later.
+.SH "CONFORMING TO"
+4.3BSD.  Not in POSIX.1-2001.
+
diff --git a/man3/dprintf.3 b/man3/dprintf.3
index 5fff67107..d8128e7d4 100644
--- a/man3/dprintf.3
+++ b/man3/dprintf.3
@@ -68,5 +68,7 @@ intended to be portable.
 
 A better name would have been
 .BR fdprintf ().
+.SH "CONFORMING TO"
+These functions are GNU extensions.
 .SH "SEE ALSO"
 .BR printf (3)
diff --git a/man3/envz_add.3 b/man3/envz_add.3
index 094809469..4970f56bd 100644
--- a/man3/envz_add.3
+++ b/man3/envz_add.3
@@ -132,7 +132,7 @@ main(int argc, char *argv[], char *envp[]) {
 	return 0;
 }
 .fi
-.SH NOTES
+.SH "CONFORMING TO"
 These functions are a GNU extension. Handle with care.
 .SH "SEE ALSO"
 .BR argz (3)
diff --git a/man3/fpathconf.3 b/man3/fpathconf.3
index 7f498ad13..5c0807c75 100644
--- a/man3/fpathconf.3
+++ b/man3/fpathconf.3
@@ -142,7 +142,7 @@ is unchanged.  If there is an error, \-1 is returned, and
 .I errno
 is set to reflect the nature of the error.
 .SH "CONFORMING TO"
-POSIX.1
+POSIX.1-2001.
 .SH NOTES
 Files with name lengths longer than the value returned for
 .I name
diff --git a/man3/ftw.3 b/man3/ftw.3
index af88ee52c..137fd79da 100644
--- a/man3/ftw.3
+++ b/man3/ftw.3
@@ -110,7 +110,7 @@ If
 .I fpath
 is a symbolic link and 
 .BR stat (2)
-failed, POSIX.1 states
+failed, POSIX.1-2001 states
 that it is undefined whether \fBFTW_NS\fP or \fBFTW_SL\fP (see below)
 is passed in
 .IR typeflag .
diff --git a/man3/getcwd.3 b/man3/getcwd.3
index fd1bb69bf..0ed4d3c13 100644
--- a/man3/getcwd.3
+++ b/man3/getcwd.3
@@ -62,7 +62,7 @@ is NULL, the behaviour of
 .BR getcwd ()
 is undefined.
 .PP
-As an extension to the POSIX.1 standard, Linux (libc4, libc5, glibc)
+As an extension to the POSIX.1-2001 standard, Linux (libc4, libc5, glibc)
 .BR getcwd ()
 allocates the buffer dynamically using
 .BR malloc ()
diff --git a/man3/getdirentries.3 b/man3/getdirentries.3
index 74d3053a4..dacbb170b 100644
--- a/man3/getdirentries.3
+++ b/man3/getdirentries.3
@@ -56,6 +56,13 @@ If an error occurs, \-1 is returned, and
 is set appropriately.
 .SH ERRORS
 See the Linux library source code for details.
+.SH "CONFORMING TO"
+Not in POSIX.1-2001.  Present on the BSDs, and a few other systems.
+Use
+.BR opendir (3)
+and 
+.BR readdir (3)
+instead.
 .SH "SEE ALSO"
 .BR lseek (2),
 .BR open (2)
diff --git a/man3/getfsent.3 b/man3/getfsent.3
index f9b89b2af..5bf496ed4 100644
--- a/man3/getfsent.3
+++ b/man3/getfsent.3
@@ -104,7 +104,7 @@ The
 .BR getfsent ()
 function appeared in 4.0BSD; the other four functions appeared in 4.3BSD.
 .SH "CONFORMING TO"
-These functions are not in POSIX.1. 
+These functions are not in POSIX.1-2001. 
 Several operating systems have them,
 e.g., *BSD, SunOS, Digital Unix, AIX (which also has a
 .BR getfstype ()).
diff --git a/man3/getloadavg.3 b/man3/getloadavg.3
index 49f6bf4cb..c6b20f75d 100644
--- a/man3/getloadavg.3
+++ b/man3/getloadavg.3
@@ -61,4 +61,7 @@ The
 function appeared in
 .Bx 4.3 Reno .
 This function is available in glibc since version 2.2.
+.Sh "CONFORMING TO"
+Not in POSIX.1-2001.  
+Present on the BSDs and Solaris.
 .\" mdoc seems to have a bug - there must be no newline here
diff --git a/man3/getpass.3 b/man3/getpass.3
index dd025dd5f..047689f40 100644
--- a/man3/getpass.3
+++ b/man3/getpass.3
@@ -99,6 +99,9 @@ Glibc2 accepts _SC_PASS_MAX and returns BUFSIZ (e.g., 8192).
 A
 .BR getpass ()
 function appeared in Version 7 AT&T UNIX.
+.SH "CONFORMING TO"
+Present in SUSv2, but marked LEGACY.  
+Removed in POSIX.1-2001.
 .SH BUGS
 The calling process should zero the password as soon as possible to avoid
 leaving the cleartext password visible in the process's address space.
diff --git a/man3/getrpcent.3 b/man3/getrpcent.3
index 118f5ad73..342f94f39 100644
--- a/man3/getrpcent.3
+++ b/man3/getrpcent.3
@@ -92,6 +92,9 @@ program number is found, or until end-of-file is encountered.
 .TP 20
 .I /etc/rpc
 .PD
+.SH "CONFORMING TO"
+Not in POSIX.1-2001.  
+Present on the BSDs, Solaris, and many other systems.
 .SH "SEE ALSO"
 .BR rpc (5),
 .BR rpcinfo (8),
diff --git a/man3/getrpcport.3 b/man3/getrpcport.3
index bcbc63580..78bc6d93a 100644
--- a/man3/getrpcport.3
+++ b/man3/getrpcport.3
@@ -30,3 +30,6 @@ is registered but not with version
 it will still return a port number (for some version of the program)
 indicating that the program is indeed registered.
 The version mismatch will be detected upon the first call to the service.
+.SH "CONFORMING TO"
+Not in POSIX.1-2001.  
+Present on the BSDs, Solaris, and many other systems.
diff --git a/man3/getttyent.3 b/man3/getttyent.3
index f27a2eb69..94647e3e8 100644
--- a/man3/getttyent.3
+++ b/man3/getttyent.3
@@ -62,6 +62,9 @@ can be
 Under Linux the file
 .IR /etc/ttys ,
 and the functions described above, are not used.
+.SH "CONFORMING TO"
+Not in POSIX.1-2001.  
+Present on the BSDs, and perhaps other systems.
 .SH "SEE ALSO"
 .BR ttyname (3),
 .BR ttyslot (3)
diff --git a/man3/hsearch.3 b/man3/hsearch.3
index 9eb90fd51..ba98ebaaf 100644
--- a/man3/hsearch.3
+++ b/man3/hsearch.3
@@ -121,7 +121,7 @@ Table full with \fIaction\fP set to \fBENTER\fP.
 .B ESRCH
 The \fIaction\fP parameter is \fBFIND\fP and no corresponding element
 is found in the table.
-.SH "CONFORMS TO"
+.SH "CONFORMING TO"
 The functions
 .BR hcreate (),
 .BR hsearch (),
diff --git a/man3/login.3 b/man3/login.3
index 7c0bb1145..424612208 100644
--- a/man3/login.3
+++ b/man3/login.3
@@ -111,6 +111,9 @@ user accounting database, configured through _PATH_UTMP in
 .I /var/log/wtmp
 user accounting log file, configured through _PATH_WTMP in
 .I <paths.h>
+.SH "CONFORMING TO"
+Not in POSIX.1-2001.  
+Present on the BSDs.
 .SH "SEE ALSO"
 .BR getutent (3),
 .BR utmp (5)
diff --git a/man3/malloc_hook.3 b/man3/malloc_hook.3
index 1280b8519..53496ed57 100644
--- a/man3/malloc_hook.3
+++ b/man3/malloc_hook.3
@@ -119,6 +119,8 @@ my_malloc_hook (size_t size, const void *caller) {
     return result;
 }
 .fi
+.SH "CONFORMING TO"
+These functions are GNU extensions.
 .SH "SEE ALSO"
 .BR mallinfo (3),
 .BR malloc (3),
diff --git a/man3/mpool.3 b/man3/mpool.3
index ea0dc49af..e6c9a0fe8 100644
--- a/man3/mpool.3
+++ b/man3/mpool.3
@@ -212,6 +212,9 @@ function may fail and set
 .I errno
 for any of the errors specified for the library routine
 .BR free (3).
+.SH "CONFORMING TO"
+Not in POSIX.1-2001.  
+Present on the BSDs.
 .SH "SEE ALSO"
 .BR dbopen (3),
 .BR btree (3),
diff --git a/man3/mtrace.3 b/man3/mtrace.3
index df78f097d..654dac660 100644
--- a/man3/mtrace.3
+++ b/man3/mtrace.3
@@ -37,7 +37,7 @@ The output of
 .BR mtrace ()
 will be ASCII but not in a friendly format. 
 So glibc comes with a perl-script called mtrace to make sense of it. 
-.SH "CONFORMS TO"
+.SH "CONFORMING TO"
 These are GNU extensions.
 .SH "SEE ALSO"
 .BR malloc (3),
diff --git a/man3/profil.3 b/man3/profil.3
index 873c4a334..42cfbb86f 100644
--- a/man3/profil.3
+++ b/man3/profil.3
@@ -63,7 +63,7 @@ itimers.
 True kernel profiling provides more accurate results.
 Libc 4.4 contained a kernel patch providing a system call profil.
 .SH "CONFORMING TO"
-Similar to a call in SVr4 (but not POSIX.1).
+Similar to a call in SVr4 (but not POSIX.1-2001).
 .SH "SEE ALSO"
 .BR gprof (1),
 .BR setitimer (2),
diff --git a/man3/putgrent.3 b/man3/putgrent.3
index 29816a101..69da6695c 100644
--- a/man3/putgrent.3
+++ b/man3/putgrent.3
@@ -35,6 +35,8 @@ struct group {
 .RE
 .SH "RETURN VALUE"
 The function returns zero on success, and a non-zero value on error.
+.SH "CONFORMING TO"
+This function is a GNU extension.
 .SH "SEE ALSO"
 .BR fgetgrent (3),
 .BR getgrent (3),
diff --git a/man3/queue.3 b/man3/queue.3
index efbe1da7a..50eb843a5 100644
--- a/man3/queue.3
+++ b/man3/queue.3
@@ -449,7 +449,9 @@ for (np = head.cqh_last; np != (void *)&head; np = np->entries.cqe_prev)
 while (head.cqh_first != (void *)&head)
 	CIRCLEQ_REMOVE(&head, head.cqh_first, entries);
 .Ed
-.Sh HISTORY
+.Sh "CONFORMING TO"
+Not in POSIX.1-2001.
+Present on the BSDs.
 The
 .Nm queue
 functions first appeared in
diff --git a/man3/rcmd.3 b/man3/rcmd.3
index d51672879..2753d40a6 100644
--- a/man3/rcmd.3
+++ b/man3/rcmd.3
@@ -192,6 +192,12 @@ set according to the reason for failure.
 The error code
 .Dv EAGAIN
 is overloaded to mean ``All network ports in use.''
+.Sh "CONFORMING TO"
+Not in POSIX.1-2001.
+Present on the BSDs, Solaris, and many other systems.
+These
+functions appeared in 
+.Bx 4.2 .
 .Sh SEE ALSO
 .Xr rlogin 1 ,
 .Xr rsh 1 ,
@@ -200,7 +206,3 @@ is overloaded to mean ``All network ports in use.''
 .Xr rexecd 8 ,
 .Xr rlogind 8 ,
 .Xr rshd 8
-.Sh HISTORY
-These
-functions appeared in 
-.Bx 4.2 .
diff --git a/man3/rexec.3 b/man3/rexec.3
index 93e072f99..2b5b57040 100644
--- a/man3/rexec.3
+++ b/man3/rexec.3
@@ -121,7 +121,9 @@ although you may be able to get its attention by using out-of-band data.
 .Sh SEE ALSO
 .Xr rcmd 3 ,
 .Xr rexecd 8
-.Sh HISTORY
+.Sh "CONFORMING TO"
+Not in POSIX.1-2001.
+Present on the BSDs, Solaris, and many other systems.
 The
 .Fn rexec
 function appeared in
diff --git a/man3/scandir.3 b/man3/scandir.3
index 4e37f6e6f..4d7fcfc43 100644
--- a/man3/scandir.3
+++ b/man3/scandir.3
@@ -84,7 +84,7 @@ respectively less than, equal to, or greater than the second.
 .B ENOMEM
 Insufficient memory to complete the operation.
 .SH "CONFORMING TO"
-None of these functions are in POSIX.1, but 
+None of these functions is in POSIX.1-2001, but 
 .BR alphasort ()
 and 
 .BR scandir () 
diff --git a/man3/strfmon.3 b/man3/strfmon.3
index 694a15159..e78442ef8 100644
--- a/man3/strfmon.3
+++ b/man3/strfmon.3
@@ -136,6 +136,9 @@ and Portuguese locales yield
 .br
 [ **1234$57Esc] [ **1.234$57PTE ]
 .RE
+.SH "CONFORMING TO"
+Not in POSIX.1-2001.
+Presnt on several other systems.
 .SH "SEE ALSO"
 .BR setlocale (3),
 .BR sprintf (3),
diff --git a/man3/tcgetpgrp.3 b/man3/tcgetpgrp.3
index d9f2d70e9..2e843b5c3 100644
--- a/man3/tcgetpgrp.3
+++ b/man3/tcgetpgrp.3
@@ -103,8 +103,8 @@ These functions are implemented via the TIOCGPGRP and
 TIOCSPGRP ioctls.
 .SH HISTORY
 These ioctls appeared in 4.2BSD. The functions are POSIX inventions.
-.SH "CONFORMS TO"
-POSIX.1
+.SH "CONFORMING TO"
+POSIX.1-2001.
 .SH "SEE ALSO"
 .BR setpgid (2),
 .BR setsid (2)
diff --git a/man3/tcgetsid.3 b/man3/tcgetsid.3
index 0de9025d0..89e6a82ad 100644
--- a/man3/tcgetsid.3
+++ b/man3/tcgetsid.3
@@ -61,7 +61,7 @@ This function is implemented via the TIOCGSID
 .BR ioctl (), 
 present
 since Linux 2.1.71.
-.SH "CONFORMS TO"
+.SH "CONFORMING TO"
 POSIX.1-2001
 .SH "SEE ALSO"
 .BR getsid (2)
diff --git a/man3/timegm.3 b/man3/timegm.3
index 31a5479b5..8cffcd3e7 100644
--- a/man3/timegm.3
+++ b/man3/timegm.3
@@ -79,6 +79,9 @@ time_t my_timegm (struct tm *tm) {
 }
 .fi
 .RE
+.SH "CONFORMING TO"
+Not in POSIX.1-2001.
+Present on the BSDs.
 .SH "SEE ALSO"
 .BR gmtime (3),
 .BR localtime (3),
diff --git a/man3/ttyslot.3 b/man3/ttyslot.3
index 38ec7d0c6..f1ee5f351 100644
--- a/man3/ttyslot.3
+++ b/man3/ttyslot.3
@@ -120,7 +120,7 @@ Minix also has
 .SH HISTORY
 .BR ttyslot ()
 appeared in Unix V7.
-.SH "CONFORMS TO"
+.SH "CONFORMING TO"
 SUSv1; marked as LECACY in SUSv2; removed in POSIX.1-2001.
 SUSv2 requires \-1 on error.
 .SH "SEE ALSO"
diff --git a/man3/updwtmp.3 b/man3/updwtmp.3
index 23aeccc40..a3bb03af3 100644
--- a/man3/updwtmp.3
+++ b/man3/updwtmp.3
@@ -48,6 +48,9 @@ used to occur in the old libbsd. These days, the
 function is included in libutil. (Hence you'll need to add
 .B \-lutil
 to your compiler command line to get it.)
+.SH "CONFORMING TO"
+Not in POSIX.1-2001.
+Present on Solaris, NetBSD, and perhaps other systems.
 .SH FILES
 .TP
 .I /var/log/wtmp
diff --git a/man7/hier.7 b/man7/hier.7
index 0555b5bfb..7bb0323f2 100644
--- a/man7/hier.7
+++ b/man7/hier.7
@@ -458,7 +458,7 @@ this directory holds temporary files stored for an unspecified duration.
 .TP
 .I /var/yp
 Database files for NIS.
-.SH "CONFORMS TO"
+.SH "CONFORMING TO"
 The Filesystem Hierarchy Standard, Version 2.2 <http://www.pathname.com/fhs/>
 .SH BUGS
 This list is not exhaustive; different systems may be configured
diff --git a/man7/locale.7 b/man7/locale.7
index 4ad2d49d9..a4ff35ae4 100644
--- a/man7/locale.7
+++ b/man7/locale.7
@@ -191,8 +191,8 @@ struct lconv {
 };
 .fi
 .in +0.25i
-.SH "CONFORMS TO"
-POSIX.1
+.SH "CONFORMING TO"
+POSIX.1-2001.
 
 The GNU gettext functions are specified in LI18NUX2000.
 .SH "SEE ALSO"
diff --git a/man7/pipe.7 b/man7/pipe.7
index b17be3e44..f2babfafd 100644
--- a/man7/pipe.7
+++ b/man7/pipe.7
@@ -131,7 +131,7 @@ In Linux versions before 2.6.11, the capacity of a pipe was the same as
 the system page size (e.g., 4096 bytes on x86).
 Since Linux 2.6.11, the pipe capacity is 65536 bytes.
 .SS PIPE_BUF
-POSIX.1 says that
+POSIX.1-2001 says that
 .BR write (2)s
 of less than 
 .B PIPE_BUF 
@@ -141,7 +141,7 @@ Writes of more than
 .B PIPE_BUF
 bytes may be non-atomic: the kernel may interleave the data 
 with data written by other processes.
-POSIX.1 requires 
+POSIX.1-2001 requires 
 .B PIPE_BUF 
 to be at least 512 bytes.  (On Linux, 
 .B PIPE_BUF 
@@ -222,7 +222,7 @@ is supported for pipes and FIFOs only since kernel 2.6.
 .SS "Portability notes"
 On some systems (but not Linux), pipes are bidirectional: 
 data can be transmitted in both directions between the pipe ends.
-According to POSIX.1, pipes only need to be unidirectional.
+According to POSIX.1-2001, pipes only need to be unidirectional.
 Portable applications should avoid reliance on 
 bidirectional pipe semantics.
 .SH "SEE ALSO"
diff --git a/man7/suffixes.7 b/man7/suffixes.7
index 42ebbbbdf..9fd42395b 100644
--- a/man7/suffixes.7
+++ b/man7/suffixes.7
@@ -267,7 +267,7 @@ Suffix	File type
  ~	Emacs or \fBpatch\fP(1) backup file
  rc	startup (`run control') file, e.g. \fI.newsrc\fP
 .TE
-.SH "CONFORMS TO"
+.SH "CONFORMING TO"
 General UNIX conventions.
 .SH BUGS
 This list is not exhaustive.