diff --git a/external/bsd/blocklist/Makefile.inc b/external/bsd/blocklist/Makefile.inc
index ad19384618eb..a163709a0f43 100644
--- a/external/bsd/blocklist/Makefile.inc
+++ b/external/bsd/blocklist/Makefile.inc
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile.inc,v 1.1.1.1 2020/06/15 01:52:52 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.2 2020/06/15 02:29:44 christos Exp $
 
 WARNS=6
 .if !defined(LIB)
 LDADD+=	-lblocklist
-DPADD+= ${LIBBLACKLIST}
+DPADD+= ${LIBBLOCKLIST}
 .endif
 CPPFLAGS+= -I${.CURDIR}/../include
 CPPFLAGS+=-DHAVE_STRUCT_SOCKADDR_SA_LEN -DHAVE_UTIL_H -DHAVE_DB_H
diff --git a/external/bsd/blocklist/bin/blocklistctl.8 b/external/bsd/blocklist/bin/blocklistctl.8
index 49feca1aaadb..3cdbd9aba215 100644
--- a/external/bsd/blocklist/bin/blocklistctl.8
+++ b/external/bsd/blocklist/bin/blocklistctl.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: blocklistctl.8,v 1.1.1.1 2020/06/15 01:52:52 christos Exp $
+.\" $NetBSD: blocklistctl.8,v 1.2 2020/06/15 02:29:44 christos Exp $
 .\"
 .\" Copyright (c) 2015 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -28,7 +28,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd June 7, 2016
-.Dt BLACKLISTCTL 8
+.Dt BLOCKLISTCTL 8
 .Os
 .Sh NAME
 .Nm blocklistctl
diff --git a/external/bsd/blocklist/bin/blocklistd.8 b/external/bsd/blocklist/bin/blocklistd.8
index 13bec4c4e5b7..4e3edfa6601b 100644
--- a/external/bsd/blocklist/bin/blocklistd.8
+++ b/external/bsd/blocklist/bin/blocklistd.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: blocklistd.8,v 1.1.1.1 2020/06/15 01:52:53 christos Exp $
+.\" $NetBSD: blocklistd.8,v 1.2 2020/06/15 02:29:44 christos Exp $
 .\"
 .\" Copyright (c) 2015 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -28,7 +28,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd April 21, 2020
-.Dt BLACKLISTD 8
+.Dt BLOCKLISTD 8
 .Os
 .Sh NAME
 .Nm blocklistd
diff --git a/external/bsd/blocklist/bin/blocklistd.conf.5 b/external/bsd/blocklist/bin/blocklistd.conf.5
index f950c6a5c5e6..392a6a50d4cc 100644
--- a/external/bsd/blocklist/bin/blocklistd.conf.5
+++ b/external/bsd/blocklist/bin/blocklistd.conf.5
@@ -1,4 +1,4 @@
-.\" $NetBSD: blocklistd.conf.5,v 1.1.1.1 2020/06/15 01:52:53 christos Exp $
+.\" $NetBSD: blocklistd.conf.5,v 1.2 2020/06/15 02:29:44 christos Exp $
 .\"
 .\" Copyright (c) 2015 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -28,7 +28,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd May 18, 2020
-.Dt BLACKLISTD.CONF 5
+.Dt BLOCKLISTD.CONF 5
 .Os
 .Sh NAME
 .Nm blocklistd.conf
diff --git a/external/bsd/blocklist/diff/ftpd.diff b/external/bsd/blocklist/diff/ftpd.diff
index 284b6272b266..37b43dae2295 100644
--- a/external/bsd/blocklist/diff/ftpd.diff
+++ b/external/bsd/blocklist/diff/ftpd.diff
@@ -43,7 +43,7 @@ diff -u -p -u -r1.63 Makefile
  
 +SRCS+=	pfilter.c
 +LDADD+=	-lblocklist
-+DPADD+=	${LIBBLACKLIST}
++DPADD+=	${LIBBLOCKLIST}
 +
  .if defined(NO_INTERNAL_LS)
  CPPFLAGS+=-DNO_INTERNAL_LS
diff --git a/external/bsd/blocklist/diff/named.diff b/external/bsd/blocklist/diff/named.diff
index 64ecc5211178..a5069ff94df7 100644
--- a/external/bsd/blocklist/diff/named.diff
+++ b/external/bsd/blocklist/diff/named.diff
@@ -64,7 +64,7 @@ diff -u -u -r1.8 Makefile
  	update.c xfrout.c zoneconf.c ${SRCS_UNIX}
  
 +LDADD+=-lblocklist
-+DPADD+=${LIBBLACKLIST}
++DPADD+=${LIBBLOCKLIST}
  .include <bsd.prog.mk>
 Index: dist/bin/named/client.c
 ===================================================================
diff --git a/external/bsd/blocklist/diff/postfix.diff b/external/bsd/blocklist/diff/postfix.diff
index 2999b5761a30..6d88e714c505 100644
--- a/external/bsd/blocklist/diff/postfix.diff
+++ b/external/bsd/blocklist/diff/postfix.diff
@@ -74,7 +74,7 @@ diff -u -r1.6 Makefile
  DPADD+= ${LIBPMASTER} ${LIBPMILTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPXSASL}
  LDADD+= ${LIBPMASTER} ${LIBPMILTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPXSASL}
  
-+DPADD+=	${LIBBLACKLIST}
++DPADD+=	${LIBBLOCKLIST}
 +LDADD+=	-lblocklist
 +
  DPADD+=	${LIBPTLS} ${LIBSSL} ${LIBCRYPTO}
diff --git a/external/bsd/blocklist/diff/proftpd.diff b/external/bsd/blocklist/diff/proftpd.diff
index a3afd5b576b1..e8d2cc5e9e07 100644
--- a/external/bsd/blocklist/diff/proftpd.diff
+++ b/external/bsd/blocklist/diff/proftpd.diff
@@ -5,7 +5,7 @@
  FTPWHO_OBJS=ftpwho.o scoreboard.o misc.o
  BUILD_FTPWHO_OBJS=utils/ftpwho.o utils/scoreboard.o utils/misc.o
 +
-+CPPFLAGS+=-DHAVE_BLACKLIST
++CPPFLAGS+=-DHAVE_BLOCKLIST
 +LIBS+=-lblocklist
 +OBJS+= pfilter.o
 +BUILD_OBJS+= src/pfilter.o
@@ -84,7 +84,7 @@
 +#include "pfilter.h"
 +#include "conf.h"
 +#include "privs.h"
-+#ifdef HAVE_BLACKLIST
++#ifdef HAVE_BLOCKLIST
 +#include <blocklist.h>
 +#endif
 +
@@ -93,7 +93,7 @@
 +void
 +pfilter_init(void)
 +{
-+#ifdef HAVE_BLACKLIST
++#ifdef HAVE_BLOCKLIST
 +	if (blstate == NULL)
 +		blstate = blocklist_open();
 +#endif
@@ -102,7 +102,7 @@
 +void
 +pfilter_notify(int a)
 +{
-+#ifdef HAVE_BLACKLIST
++#ifdef HAVE_BLOCKLIST
 +	conn_t *c = session.c;
 +	int fd;
 +
diff --git a/external/bsd/blocklist/diff/ssh.diff b/external/bsd/blocklist/diff/ssh.diff
index 1e7e9ae2e31e..17300bb5dc8d 100644
--- a/external/bsd/blocklist/diff/ssh.diff
+++ b/external/bsd/blocklist/diff/ssh.diff
@@ -61,7 +61,7 @@ diff -u -u -r1.10 Makefile
  DPADD+=	${LIBWRAP}
 +
 +LDADD+=	-lblocklist
-+DPADD+=	${LIBBLACKLIST}
++DPADD+=	${LIBBLOCKLIST}
 diff -ru openssh-7.7p1/auth-pam.c dist/auth-pam.c
 --- openssh-7.7p1/auth-pam.c	2018-04-02 01:38:28.000000000 -0400
 +++ dist/auth-pam.c	2018-05-23 11:56:22.206661484 -0400
diff --git a/external/bsd/blocklist/include/blocklist.h b/external/bsd/blocklist/include/blocklist.h
index 5432f62a1eea..2f137812e5af 100644
--- a/external/bsd/blocklist/include/blocklist.h
+++ b/external/bsd/blocklist/include/blocklist.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: blocklist.h,v 1.1.1.1 2020/06/15 01:52:53 christos Exp $	*/
+/*	$NetBSD: blocklist.h,v 1.2 2020/06/15 02:29:45 christos Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -28,8 +28,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef _BLACKLIST_H
-#define _BLACKLIST_H
+#ifndef _BLOCKLIST_H
+#define _BLOCKLIST_H
 
 #include <sys/socket.h>
 
@@ -44,12 +44,12 @@ int blocklist_sa_r(struct blocklist *, int, int,
 __END_DECLS
 
 /* action values for user applications */
-#define BLACKLIST_API_ENUM	1
+#define BLOCKLIST_API_ENUM	1
 enum {
-        BLACKLIST_AUTH_OK = 0,
-        BLACKLIST_AUTH_FAIL,
-        BLACKLIST_ABUSIVE_BEHAVIOR,
-        BLACKLIST_BAD_USER
+        BLOCKLIST_AUTH_OK = 0,
+        BLOCKLIST_AUTH_FAIL,
+        BLOCKLIST_ABUSIVE_BEHAVIOR,
+        BLOCKLIST_BAD_USER
 };
 
-#endif /* _BLACKLIST_H */
+#endif /* _BLOCKLIST_H */
diff --git a/external/bsd/blocklist/lib/blocklist.c b/external/bsd/blocklist/lib/blocklist.c
index e925d287cdd4..170736b5def1 100644
--- a/external/bsd/blocklist/lib/blocklist.c
+++ b/external/bsd/blocklist/lib/blocklist.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: blocklist.c,v 1.1.1.1 2020/06/15 01:52:53 christos Exp $	*/
+/*	$NetBSD: blocklist.c,v 1.2 2020/06/15 02:29:45 christos Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: blocklist.c,v 1.1.1.1 2020/06/15 01:52:53 christos Exp $");
+__RCSID("$NetBSD: blocklist.c,v 1.2 2020/06/15 02:29:45 christos Exp $");
 
 #include <stdio.h>
 #include <bl.h>
@@ -65,16 +65,16 @@ blocklist_sa_r(struct blocklist *bl, int action, int rfd,
 
 	/* internal values are not the same as user application values */
 	switch (action) {
-	case BLACKLIST_AUTH_FAIL:
+	case BLOCKLIST_AUTH_FAIL:
 		internal_action = BL_ADD;
 		break;
-	case BLACKLIST_AUTH_OK:
+	case BLOCKLIST_AUTH_OK:
 		internal_action = BL_DELETE;
 		break;
-	case BLACKLIST_ABUSIVE_BEHAVIOR:
+	case BLOCKLIST_ABUSIVE_BEHAVIOR:
 		internal_action = BL_ABUSE;
 		break;
-	case BLACKLIST_BAD_USER:
+	case BLOCKLIST_BAD_USER:
 		internal_action = BL_BADUSER;
 		break;
 	default:
diff --git a/external/bsd/blocklist/lib/libblocklist.3 b/external/bsd/blocklist/lib/libblocklist.3
index e5369f6b2be1..161a0aef8cd2 100644
--- a/external/bsd/blocklist/lib/libblocklist.3
+++ b/external/bsd/blocklist/lib/libblocklist.3
@@ -1,4 +1,4 @@
-.\" $NetBSD: libblocklist.3,v 1.1.1.1 2020/06/15 01:52:53 christos Exp $
+.\" $NetBSD: libblocklist.3,v 1.2 2020/06/15 02:29:45 christos Exp $
 .\"
 .\" Copyright (c) 2015 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -28,7 +28,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd March 30, 2020
-.Dt LIBBLACKLIST 3
+.Dt LIBBLOCKLIST 3
 .Os
 .Sh NAME
 .Nm blocklist_open ,
@@ -89,17 +89,17 @@ argument.
 The
 .Ar action
 parameter can take these values:
-.Bl -tag -width ".Va BLACKLIST_ABUSIVE_BEHAVIOR"
-.It Va BLACKLIST_AUTH_FAIL
+.Bl -tag -width ".Va BLOCKLIST_ABUSIVE_BEHAVIOR"
+.It Va BLOCKLIST_AUTH_FAIL
 There was an unsuccessful authentication attempt.
-.It Va BLACKLIST_AUTH_OK
+.It Va BLOCKLIST_AUTH_OK
 A user successfully authenticated.
-.It Va BLACKLIST_ABUSIVE_BEHAVIOR
+.It Va BLOCKLIST_ABUSIVE_BEHAVIOR
 The sending daemon has detected abusive behavior
 from the remote system.
 The remote address should
 be blocked as soon as possible.
-.It Va BLACKLIST_BAD_USER
+.It Va BLOCKLIST_BAD_USER
 The sending daemon has determined the username
 presented for authentication is invalid.
 The
@@ -108,7 +108,7 @@ daemon compares the username to a configured list of forbidden
 usernames and
 blocks the address immediately if a forbidden username matches.
 (The
-.Ar BLACKLIST_BAD_USER
+.Ar BLOCKLIST_BAD_USER
 support is not currently available.)
 .El
 .Pp