Index: include/search.h
===================================================================
--- include/search.h
+++ include/search.h
@@ -46,11 +46,8 @@
 #endif
 
 #if __BSD_VISIBLE
-struct _ENTRY;
 struct hsearch_data {
-	struct _ENTRY *table;
-	size_t size;
-	size_t filled;
+	struct __hsearch *__hsearch;
 };
 #endif
 
Index: lib/libc/stdlib/Makefile.inc
===================================================================
--- lib/libc/stdlib/Makefile.inc
+++ lib/libc/stdlib/Makefile.inc
@@ -6,7 +6,8 @@
 
 MISRCS+=_Exit.c a64l.c abort.c abs.c atexit.c atof.c atoi.c atol.c atoll.c \
 	bsearch.c div.c exit.c getenv.c getopt.c getopt_long.c \
-	getsubopt.c hcreate.c heapsort.c heapsort_b.c imaxabs.c imaxdiv.c \
+	getsubopt.c hcreate.c hcreate_r.c hdestroy_r.c heapsort.c heapsort_b.c \
+	hsearch_r.c imaxabs.c imaxdiv.c \
 	insque.c l64a.c labs.c ldiv.c llabs.c lldiv.c lsearch.c \
 	merge.c mergesort_b.c ptsname.c qsort.c qsort_r.c quick_exit.c \
 	radixsort.c rand.c \
Index: lib/libc/stdlib/hcreate.3
===================================================================
--- lib/libc/stdlib/hcreate.3
+++ lib/libc/stdlib/hcreate.3
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 21, 2014
+.Dd December 18, 2015
 .Dt HCREATE 3
 .Os
 .Sh NAME
@@ -76,8 +76,8 @@
 .Fa nel
 argument is an estimate of the maximum
 number of entries that the table should contain.
-This number may be adjusted upward by the
-algorithm in order to obtain certain mathematically favorable circumstances.
+As this implementation resizes the hash table dynamically,
+this argument is ignored.
 .Pp
 The
 .Fn hdestroy
@@ -274,8 +274,6 @@
 .Bl -tag -width Er
 .It Bq Er ENOMEM
 Insufficient memory is available.
-.It Bq Er EINVAL
-A table already exists.
 .El
 .Pp
 The