diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 2fc637656acd..5485bce2b405 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1245 2020/05/24 19:47:59 christos Exp $
+# $NetBSD: mi,v 1.1246 2020/05/30 20:47:58 christos Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -1303,7 +1303,7 @@
 ./usr/include/ufs/mfs				base-c-usr
 ./usr/include/ufs/ufs				base-c-usr
 ./usr/include/uvm				base-c-usr
-./usr/include/uv				base-c-usr
+./usr/include/uv				base-obsolete		obsolete
 ./usr/include/vm				base-obsolete		obsolete
 ./usr/lib					base-sys-usr		compatdir
 ./usr/lib/clang					base-sys-usr
diff --git a/distrib/sets/lists/base/shl.mi b/distrib/sets/lists/base/shl.mi
index 8a6d90d1b714..28b3d6ad4ada 100644
--- a/distrib/sets/lists/base/shl.mi
+++ b/distrib/sets/lists/base/shl.mi
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.889 2020/05/28 17:06:24 christos Exp $
+# $NetBSD: shl.mi,v 1.890 2020/05/30 20:47:58 christos Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -920,9 +920,9 @@
 ./usr/lib/libuutil.so				base-zfs-shlib		compatfile,zfs
 ./usr/lib/libuutil.so.0				base-zfs-shlib		compatfile,zfs
 ./usr/lib/libuutil.so.0.0			base-zfs-shlib		compatfile,zfs
-./usr/lib/libuv.so				base-sys-shlib		compatfile
-./usr/lib/libuv.so.1				base-sys-shlib		compatfile
-./usr/lib/libuv.so.1.0				base-sys-shlib		compatfile
+./usr/lib/libuv.so				base-obsolete		compatfile,obsolete
+./usr/lib/libuv.so.1				base-obsolete		compatfile,obsolete
+./usr/lib/libuv.so.1.0				base-obsolete		compatfile,obsolete
 ./usr/lib/libwind.so				base-krb5-shlib		compatfile,kerberos
 ./usr/lib/libwind.so.1				base-krb5-shlib		compatfile,kerberos
 ./usr/lib/libwind.so.1.0			base-krb5-shlib		compatfile,kerberos
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 522806f5af04..f539cb5a1bc5 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2330 2020/05/24 19:47:59 christos Exp $
+#	$NetBSD: mi,v 1.2331 2020/05/30 20:47:58 christos Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp				comp-sys-root
@@ -3302,12 +3302,12 @@
 ./usr/include/utmp.h				comp-c-include
 ./usr/include/utmpx.h				comp-c-include
 ./usr/include/uuid.h				comp-c-include
-./usr/include/uv.h				comp-c-include
-./usr/include/uv/bsd.h				comp-c-include
-./usr/include/uv/errno.h			comp-c-include
-./usr/include/uv/threadpool.h			comp-c-include
-./usr/include/uv/unix.h				comp-c-include
-./usr/include/uv/version.h			comp-c-include
+./usr/include/uv.h				comp-c-obsolete		obsolete
+./usr/include/uv/bsd.h				comp-c-obsolete		obsolete
+./usr/include/uv/errno.h			comp-c-obsolete		obsolete
+./usr/include/uv/threadpool.h			comp-c-obsolete		obsolete
+./usr/include/uv/unix.h				comp-c-obsolete		obsolete
+./usr/include/uv/version.h			comp-c-obsolete		obsolete
 ./usr/include/uvm/uvm.h				comp-c-include
 ./usr/include/uvm/uvm_amap.h			comp-c-include
 ./usr/include/uvm/uvm_amap_i.h			comp-obsolete		obsolete
@@ -3925,8 +3925,8 @@
 ./usr/lib/libusbhid_p.a				comp-c-proflib		compatfile,profile
 ./usr/lib/libutil.a				comp-c-lib		compatfile
 ./usr/lib/libutil_p.a				comp-c-proflib		compatfile,profile
-./usr/lib/libuv.a				comp-c-lib		compatfile
-./usr/lib/libuv_p.a				comp-c-proflib		compatfile,profile
+./usr/lib/libuv.a				comp-obsolete		compatfile,obsolete
+./usr/lib/libuv_p.a				comp-obsolete		obsolete
 ./usr/lib/libuutil.a				comp-zfs-lib		compatfile,zfs
 ./usr/lib/libuutil_p.a				comp-zfs-proflib	compatfile,zfs,profile
 ./usr/lib/libwind.a				comp-krb5-lib		compatfile,kerberos
@@ -3953,7 +3953,7 @@
 ./usr/lib/pkgconfig/libcrypto.pc		comp-crypto-lib		share
 ./usr/lib/pkgconfig/libfido2.pc			comp-c-lib		share
 ./usr/lib/pkgconfig/libssl.pc			comp-crypto-lib		share
-./usr/lib/pkgconfig/libuv.pc			comp-c-lib		share
+./usr/lib/pkgconfig/libuv.pc			comp-obsolete		share,obsolete
 ./usr/lib/pkgconfig/lutok.pc			comp-crypto-lib		kyua,share
 ./usr/lib/pkgconfig/openssl.pc			comp-crypto-lib		share
 ./usr/lib/pkgconfig/sqlite3.pc			comp-c-lib
@@ -8480,7 +8480,7 @@
 ./usr/share/man/cat3/libusb.0			comp-obsolete		obsolete
 ./usr/share/man/cat3/libusbhid.0		comp-c-catman		.cat
 ./usr/share/man/cat3/libutil.0			comp-c-catman		.cat
-./usr/share/man/cat3/libuv.0			comp-c-catman		.cat
+./usr/share/man/cat3/libuv.0			comp-obsolete		obsolete
 ./usr/share/man/cat3/limits.0			comp-c-catman		.cat
 ./usr/share/man/cat3/link_addr.0		comp-c-catman		.cat
 ./usr/share/man/cat3/link_field.0		comp-c-catman		.cat
@@ -16578,7 +16578,7 @@
 ./usr/share/man/html3/libsaslc.html		comp-c-htmlman		html
 ./usr/share/man/html3/libusbhid.html		comp-c-htmlman		html
 ./usr/share/man/html3/libutil.html		comp-c-htmlman		html
-./usr/share/man/html3/libuv.html		comp-c-htmlman		html
+./usr/share/man/html3/libuv.html		comp-obsolete		obsolete
 ./usr/share/man/html3/limits.html		comp-c-htmlman		html
 ./usr/share/man/html3/link_addr.html		comp-c-htmlman		html
 ./usr/share/man/html3/link_field.html		comp-c-htmlman		html
@@ -24659,7 +24659,7 @@
 ./usr/share/man/man3/libusb.3			comp-obsolete		obsolete
 ./usr/share/man/man3/libusbhid.3		comp-c-man		.man
 ./usr/share/man/man3/libutil.3			comp-c-man		.man
-./usr/share/man/man3/libuv.3			comp-c-man		.man
+./usr/share/man/man3/libuv.3			comp-obsolete		obsolete
 ./usr/share/man/man3/limits.3			comp-c-man		.man
 ./usr/share/man/man3/link_addr.3		comp-c-man		.man
 ./usr/share/man/man3/link_field.3		comp-c-man		.man
diff --git a/distrib/sets/lists/comp/shl.mi b/distrib/sets/lists/comp/shl.mi
index 5838a8ba4780..ec2c8523558a 100644
--- a/distrib/sets/lists/comp/shl.mi
+++ b/distrib/sets/lists/comp/shl.mi
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.333 2020/05/24 19:48:00 christos Exp $
+# $NetBSD: shl.mi,v 1.334 2020/05/30 20:47:58 christos Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -279,7 +279,7 @@
 ./usr/lib/libusb_pic.a				comp-obsolete		obsolete
 ./usr/lib/libusbhid_pic.a			comp-c-piclib		compatfile,picinstall
 ./usr/lib/libutil_pic.a				comp-c-piclib		compatfile,picinstall
-./usr/lib/libuv_pic.a				comp-c-piclib		compatfile,picinstall
+./usr/lib/libuv_pic.a				comp-obsolete		obsolete
 ./usr/lib/libuutil_pic.a			comp-zfs-piclib		compatfile,picinstall,zfs
 ./usr/lib/libwind_pic.a				comp-c-piclib		compatfile,picinstall,kerberos
 ./usr/lib/libwrap_pic.a				comp-c-piclib		compatfile,picinstall
diff --git a/distrib/sets/lists/debug/mi b/distrib/sets/lists/debug/mi
index 43ec2fae4922..5b5e02f88fb5 100644
--- a/distrib/sets/lists/debug/mi
+++ b/distrib/sets/lists/debug/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.312 2020/05/24 19:48:00 christos Exp $
+# $NetBSD: mi,v 1.313 2020/05/30 20:47:58 christos Exp $
 ./etc/mtree/set.debug                           comp-sys-root
 ./usr/lib					comp-sys-usr		compatdir
 ./usr/lib/i18n/libBIG5_g.a			comp-c-debuglib		debuglib,compatfile
@@ -265,7 +265,7 @@
 ./usr/lib/libunbound_g.a			comp-c-debuglib		debuglib,compatfile,unbound
 ./usr/lib/libusbhid_g.a				comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libutil_g.a				comp-c-debuglib		debuglib,compatfile
-./usr/lib/libuv_g.a				comp-c-debuglib		debuglib,compatfile
+./usr/lib/libuv_g.a				comp-obsolete		obsolete,compatfile
 ./usr/lib/libuutil_g.a				comp-c-debuglib		debuglib,compatfile,zfs
 ./usr/lib/libvers_g.a				comp-c-debuglib		debuglib,compatfile,kerberos
 ./usr/lib/libwind_g.a				comp-c-debuglib		debuglib,compatfile,kerberos
diff --git a/distrib/sets/lists/debug/shl.mi b/distrib/sets/lists/debug/shl.mi
index 558ffba8ac80..526833e4af0e 100644
--- a/distrib/sets/lists/debug/shl.mi
+++ b/distrib/sets/lists/debug/shl.mi
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.250 2020/05/28 17:06:24 christos Exp $
+# $NetBSD: shl.mi,v 1.251 2020/05/30 20:47:58 christos Exp $
 ./usr/lib/libbfd_g.a						comp-c-debuglib	debuglib,compatfile,binutils
 ./usr/libdata/debug/lib						base-sys-usr	debug,dynamicroot,compatdir
 ./usr/libdata/debug/lib/libavl.so.0.0.debug			comp-zfs-debug	debug,dynamicroot,zfs
@@ -320,9 +320,9 @@
 ./usr/libdata/debug/usr/lib/libumem.so.0.0.debug		comp-zfs-debug	debug,compatfile,zfs
 ./usr/libdata/debug/usr/lib/libunbound.so.6.2.debug 		comp-net-debug	debug,compatfile,unbound
 ./usr/libdata/debug/usr/lib/libusbhid.so.1.0.debug		comp-sys-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libutil.so.7.23.debug		comp-obsolete	debug,compatfile,obsolete,compatfile
+./usr/libdata/debug/usr/lib/libutil.so.7.23.debug		comp-obsolete	debug,compatfile,obsolete
 ./usr/libdata/debug/usr/lib/libutil.so.7.24.debug		comp-sys-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libuv.so.1.0.debug			comp-sys-debug	debug,compatfile
+./usr/libdata/debug/usr/lib/libuv.so.1.0.debug			comp-obsolete	debug,compatfile,obsolete
 ./usr/libdata/debug/usr/lib/libuutil.so.0.0.debug		comp-zfs-debug	debug,compatfile,zfs
 ./usr/libdata/debug/usr/lib/libwind.so.1.0.debug		comp-krb5-debug	debug,compatfile,kerberos
 ./usr/libdata/debug/usr/lib/libwrap.so.1.0.debug		comp-net-debug	debug,compatfile
diff --git a/etc/mtree/NetBSD.dist.base b/etc/mtree/NetBSD.dist.base
index acf208244f82..0655bca82d8b 100644
--- a/etc/mtree/NetBSD.dist.base
+++ b/etc/mtree/NetBSD.dist.base
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.base,v 1.216 2020/05/24 19:29:19 christos Exp $
+#	$NetBSD: NetBSD.dist.base,v 1.217 2020/05/30 20:47:59 christos Exp $
 #	@(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -255,7 +255,6 @@
 ./usr/include/ufs/lfs
 ./usr/include/ufs/mfs
 ./usr/include/ufs/ufs
-./usr/include/uv
 ./usr/include/uvm
 ./usr/lib
 ./usr/lib/clang
diff --git a/external/mit/libuv/lib/Makefile b/external/mit/libuv/lib/Makefile
index 413b61465b7e..93b5d3fc81a8 100644
--- a/external/mit/libuv/lib/Makefile
+++ b/external/mit/libuv/lib/Makefile
@@ -1,13 +1,17 @@
-# $NetBSD: Makefile,v 1.1 2020/05/24 19:28:10 christos Exp $
+# $NetBSD: Makefile,v 1.2 2020/05/30 20:47:59 christos Exp $
+
+LIBISPRIVATE=yes
 
 .include <bsd.own.mk>
 
 MKLINT=	no
 LIB=	uv
 
+.if ${LIBISPRIVATE:Uno} == "no"
 INCS=	uv.h uv/unix.h uv/bsd.h uv/errno.h uv/version.h uv/threadpool.h
 INCSDIR=/usr/include
 MAN=	libuv.3
+.endif
 
 LIBUVDIR=${.CURDIR}/../dist
 
diff --git a/external/mpl/bind/Makefile.inc b/external/mpl/bind/Makefile.inc
index dca4fef39542..acc8c6c31532 100644
--- a/external/mpl/bind/Makefile.inc
+++ b/external/mpl/bind/Makefile.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.7 2020/05/25 15:12:54 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.8 2020/05/30 20:47:59 christos Exp $
 
 .if !defined(BIND9_MAKEFILE_INC)
 BIND9_MAKEFILE_INC=yes
@@ -14,6 +14,9 @@ CWARNFLAGS.clang+=	-Wno-unused-value -Wno-parentheses \
 
 .include <bsd.own.mk>
 
+LIBUVDIR=${NETBSDSRCDIR}/external/mit/libuv
+LIBUVOBJDIR!=   cd ${LIBUVDIR}/lib && ${PRINTOBJDIR}
+
 NAMED_USE_OPENSSL?=yes
 
 .if exists(${NETBSDSRCDIR}/sys/sys/atomic.h)
@@ -67,12 +70,18 @@ DBG=-g3 -gstabs
 # NOTE: the order of these libraries is important...
 .if defined(NAMED_DEBUG)
 LDADD+=		-lbind9_g -lisccfg_g -ldns_g -lns_g -lirs_g
-LDADD+=		-lisccc_g -lisc_g -luv_g -lkvm_g -lz_g
+LDADD+=		-lisccc_g -lisc_g
+LDADD+=		-L${LIBUVOBJDIR} -luv_g
+LDADD+=		-lkvm_g -lz_g
 .else
 LDADD+=		-lbind9 -lisccfg -ldns -lns -lirs
 DPADD+=		${LIBBIND9} ${LIBISCCFG} ${LIBDNS} ${LIBNS} ${LIBIRS}
-LDADD+=		-lisccc -lisc -luv -lkvm -lz
-DPADD+=		${LIBISCCC} ${LIBISC} ${LIBUV} ${LIBKVM} ${LIBZ}
+LDADD+=		-lisccc -lisc 
+LDADD+=		-L${LIBUVOBJDIR} -luv
+LDADD+=		-lkvm -lz
+DPADD+=		${LIBISCCC} ${LIBISC}
+DPADD+=		${LIBUVOBJDIR}/libuv.a
+DPADD+=		${LIBKVM} ${LIBZ}
 .endif
 .else
 CPPFLAGS+= -DLIBINTERFACE=${LIBINTERFACE} \
diff --git a/external/mpl/bind/lib/libisc/Makefile b/external/mpl/bind/lib/libisc/Makefile
index 2aefe31b5810..96a2dc8d84e4 100644
--- a/external/mpl/bind/lib/libisc/Makefile
+++ b/external/mpl/bind/lib/libisc/Makefile
@@ -1,10 +1,14 @@
-#	$NetBSD: Makefile,v 1.11 2020/05/24 19:46:31 christos Exp $
+#	$NetBSD: Makefile,v 1.12 2020/05/30 20:47:59 christos Exp $
 
 LIB=isc
 #USE_SHLIBDIR=   yes
 
 .include <bsd.own.mk>
 
+LIBUVDIR=${NETBSDSRCDIR}/external/mit/libuv
+LIBUVOBJDIR!=   cd ${LIBUVDIR}/lib && ${PRINTOBJDIR}
+CPPFLAGS+=-I${LIBUVDIR}/dist/include
+
 .include "${.CURDIR}/../Makefile.inc"
 
 DIST=	${IDIST}/lib/isc
@@ -47,6 +51,14 @@ CPPFLAGS.net.c=	-Wno-error
 SRCS+=		ipv6.c
 .endif
 
+LDFLAGS+=-Wl,--version-script=${.CURDIR}/isc.map
+LDADD+=-Wl,-Bstatic
+
+LDADD+=-L${LIBUVOBJDIR} -luv_pic
+DPADD+=${LIBUVOBJDIR}/libuv_pic.a
+
+LDADD+=-Wl,-Bdynamic
+
 LDADD+=-lz
 DPADD+=${LIBZ}
 
diff --git a/external/mpl/bind/lib/libisc/isc.map b/external/mpl/bind/lib/libisc/isc.map
new file mode 100644
index 000000000000..f7314dcfff36
--- /dev/null
+++ b/external/mpl/bind/lib/libisc/isc.map
@@ -0,0 +1,4 @@
+ISC {
+    local:
+	uv_*;
+};
diff --git a/external/mpl/dhcp/Makefile.inc b/external/mpl/dhcp/Makefile.inc
index 2ab4266daa44..8dabd15a1094 100644
--- a/external/mpl/dhcp/Makefile.inc
+++ b/external/mpl/dhcp/Makefile.inc
@@ -1,9 +1,13 @@
-# $NetBSD: Makefile.inc,v 1.7 2020/05/25 15:37:50 christos Exp $
+# $NetBSD: Makefile.inc,v 1.8 2020/05/30 20:47:59 christos Exp $
 
 WARNS?=	1	# XXX -Wshadow -Wcast-qual -Wsign-compare
 
 .include <bsd.own.mk>
 
+LIBUVDIR=${NETBSDSRCDIR}/external/mit/libuv
+LIBUVOBJDIR!=   cd ${LIBUVDIR}/lib && ${PRINTOBJDIR}
+
+
 USE_FORT?= yes	# network client/server
 CWARNFLAGS.clang+=	-Wno-tautological-compare \
 			-Wno-conversion -Wno-constant-logical-operand \
@@ -37,10 +41,12 @@ LDADD+= ${OMOBJDIR}/libomapi.a
 # would be to install the libraries in /lib...
 LDADD+=-Wl,-Bstatic
 .endif
-LDADD+= -lirs -lisccfg -ldns -lisc -luv -lkvm
-DPADD+= ${LIBIRS} ${LIBISCCFG} ${LIBDNS} ${LIBISC} ${LIBUV} ${LIBKVM}
-LDADD+= -lpthread -lz
-DPADD+= ${LIBPTHREAD} ${LIBZ}
+LDADD+= -lirs -lisccfg -ldns -lisc
+LDADD+= -L${LIBUVOBJDIR} -luv
+DPADD+= ${LIBIRS} ${LIBISCCFG} ${LIBDNS} ${LIBISC} ${LIBUV}
+DPADD+= ${LIBUVOBJDIR}/libuv.a
+LDADD+= -lkvm -lpthread -lz
+DPADD+= ${LIBKVM} ${LIBPTHREAD} ${LIBZ}
 .if (${MKKERBEROS} != "no")
 LDADD+= -lgssapi -lheimntlm ${LIBKRB5_LDADD} ${LIBKRB5_STATIC_LDADD}
 DPADD+= ${LIBKRB5_DPADD} ${LIBHEIMNTLM} ${LIBGSSAPI} ${LIBKRB5_STATIC_DPADD}
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 005e0d0ab222..54bfc5ddbd8a 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.README,v 1.404 2020/05/24 19:58:02 christos Exp $
+#	$NetBSD: bsd.README,v 1.405 2020/05/30 20:47:59 christos Exp $
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
 
 This is the README file for the make "include" files for the NetBSD
@@ -1758,7 +1758,6 @@ DPADD		Additional dependencies for the program.  Usually used for
 		LIBUNBOUND?=		${DESTDIR}/usr/lib/libunbound.a
 		LIBUSBHID?=		${DESTDIR}/usr/lib/libusbhid.a
 		LIBUTIL?=		${DESTDIR}/usr/lib/libutil.a
-		LIBUV?=			${DESTDIR}/usr/lib/libuv.a
 		LIBWIND?=		${DESTDIR}/usr/lib/libwind.a
 		LIBWRAP?=		${DESTDIR}/usr/lib/libwrap.a
 		LIBY?=			${DESTDIR}/usr/lib/liby.a
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 50675c7abea1..49b5d57e70b1 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.329 2020/05/24 19:58:02 christos Exp $
+#	$NetBSD: bsd.prog.mk,v 1.330 2020/05/30 20:47:59 christos Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -208,7 +208,6 @@ _LIBLIST=\
 	unbound \
 	usbhid \
 	util \
-	uv \
 	wind \
 	wrap \
 	y \