diff --git a/lib/libc/string/Makefile.inc b/lib/libc/string/Makefile.inc
index 026be17282b7..a6e994f72685 100644
--- a/lib/libc/string/Makefile.inc
+++ b/lib/libc/string/Makefile.inc
@@ -11,7 +11,11 @@ MISRCS+=bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \
 	strcmp.c strcoll.c strcpy.c strcspn.c strdup.c strerror.c \
 	strlcat.c strlcpy.c strlen.c strmode.c strncat.c strncmp.c strncpy.c \
 	strpbrk.c strrchr.c strsep.c strsignal.c strspn.c strstr.c strtok.c \
-	strxfrm.c swab.c
+	strxfrm.c swab.c wcscat.c wcschr.c wcscmp.c wcscpy.c wcscspn.c \
+	wcslcat.c wcslcpy.c wcslen.c wcsncat.c wcsncmp.c wcsncpy.c wcspbrk.c \
+	wcsrchr.c wcsspn.c wcsstr.c           wmemchr.c wmemcmp.c wmemcpy.c \
+	wmemmove.c wmemset.c
+
 
 # machine-dependent string sources
 .include "${.CURDIR}/../libc/${MACHINE_ARCH}/string/Makefile.inc"
@@ -21,7 +25,7 @@ MAN+=	bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 index.3 memccpy.3 memchr.3 \
 	memcmp.3 memcpy.3 memmove.3 memset.3 rindex.3 strcasecmp.3 strcat.3 \
 	strchr.3 strcmp.3 strcoll.3 strcpy.3 strcspn.3 strdup.3 strerror.3 \
 	string.3 strlcpy.3 strlen.3 strmode.3 strpbrk.3 strrchr.3 strsep.3 \
-	strspn.3 strstr.3 strtok.3 strxfrm.3 swab.3
+	strspn.3 strstr.3 strtok.3 strxfrm.3 swab.3 wmemchr.3
 
 MLINKS+=strcasecmp.3 strncasecmp.3
 MLINKS+=strcat.3 strncat.3
@@ -30,4 +34,14 @@ MLINKS+=strcpy.3 strncpy.3
 MLINKS+=strerror.3 perror.3 strerror.3 sys_errlist.3 strerror.3 sys_nerr.3
 MLINKS+=strlcpy.3 strlcat.3
 MLINKS+=strtok.3 strtok_r.3
+MLINKS+=wmemchr.3 wmemcmp.3 wmemchr.3 wmemcpy.3 \
+	wmemchr.3 wmemmove.3 wmemchr.3 wmemset.3 \
+	wmemchr.3 wcscat.3 wmemchr.3 wcschr.3 \
+	wmemchr.3 wcscmp.3 wmemchr.3 wcscpy.3 \
+	wmemchr.3 wcscspn.3 wmemchr.3 wcslcat.3 \
+	wmemchr.3 wcslcpy.3 wmemchr.3 wcslen.3 \
+	wmemchr.3 wcsncat.3 wmemchr.3 wcsncmp.3 \
+	wmemchr.3 wcsncpy.3 wmemchr.3 wcspbrk.3 \
+	wmemchr.3 wcsrchr.3 wmemchr.3 wcsspn.3 \
+	wmemchr.3 wcsstr.3
 .endif
diff --git a/lib/libc/string/wmemchr.3 b/lib/libc/string/wmemchr.3
index 4d2cab7405e8..63259fa1e806 100644
--- a/lib/libc/string/wmemchr.3
+++ b/lib/libc/string/wmemchr.3
@@ -137,9 +137,11 @@ counterpart, such as
 .Xr strstr 3
 .Sh STANDARDS
 These functions conform to
-.St -isoC99
+.\" .St -isoC99
+ISO/IEC 9899:1999 (``ISO C99'')
 and were first introduced in
-.St -isoC-amd1 ,
+.\" .St -isoC-amd1 ,
+ISO/IEC 9899/AMD1:1995 (``ISO C90'')
 with the exception of
 .Fn wcslcat
 and