diff --git a/mail/courier-authlib/Makefile b/mail/courier-authlib/Makefile
index dbe00eaa7d9..369976c9295 100644
--- a/mail/courier-authlib/Makefile
+++ b/mail/courier-authlib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.81 2020/11/05 19:49:52 sthen Exp $
+# $OpenBSD: Makefile,v 1.82 2021/12/14 07:49:39 giovanni Exp $
 
 COMMENT-main=		authentication library for courier
 COMMENT-ldap=		ldap authentication module for courier-authLib
@@ -6,25 +6,24 @@ COMMENT-mysql=		mysql authentication module for courier-authLib
 COMMENT-pgsql=		pgsql authentication module for courier-authLib
 COMMENT-userdb=		userdb authentication module for courier-authLib
 
-DISTNAME=		courier-authlib-0.70.0
+DISTNAME=		courier-authlib-0.71.3
 PKGNAME-main=		${DISTNAME}
 PKGNAME-ldap=		${DISTNAME:S/lib-/lib-ldap-/}
 PKGNAME-mysql=		${DISTNAME:S/lib-/lib-mysql-/}
 PKGNAME-pgsql=		${DISTNAME:S/lib-/lib-pgsql-/}
 PKGNAME-userdb=		${DISTNAME:S/lib-/lib-userdb-/}
-REVISION-mysql=		0
 
 SHARED_LIBS +=  courierauth          1.0      # .0.0
 SHARED_LIBS +=  courierauthsasl      1.0      # .0.0
 SHARED_LIBS +=  courierauthsaslclient 0.0     # .0.0
 SHARED_LIBS +=  courierauthcommon    1.0      # .0.0
-SHARED_LIBS +=  authuserdb           0.0      # .0.0
-SHARED_LIBS +=  authpwd              0.0      # .0.0
-SHARED_LIBS +=  authpgsql            0.0      # .0.0
+SHARED_LIBS +=  authuserdb           1.0      # .0.0
+SHARED_LIBS +=  authpwd              1.0      # .0.0
+SHARED_LIBS +=  authpgsql            1.0      # .0.0
 SHARED_LIBS +=  authldap             1.0      # .0.0
-SHARED_LIBS +=  authmysql            0.0      # .0.0
-SHARED_LIBS +=  authpipe             0.0      # .0.0
-SHARED_LIBS +=  authsqlite           0.0      # .0.0
+SHARED_LIBS +=  authmysql            1.0      # .0.0
+SHARED_LIBS +=  authpipe             1.0      # .0.0
+SHARED_LIBS +=  authsqlite           1.0      # .0.0
 
 CATEGORIES=		mail security
 HOMEPAGE=		http://www.courier-mta.org/authlib/
@@ -157,8 +156,6 @@ post-install:
 
 	${INSTALL_SCRIPT} ${WRKSRC}/sysconftool \
 	    ${PREFIX}/libexec/courier-authlib/sysconftool
-	${INSTALL_SCRIPT} ${WRKSRC}/authmigrate \
-	    ${PREFIX}/libexec/courier-authlib/authmigrate
 	${INSTALL_DATA_DIR} ${EXAMPLE_DIR}
 	@mv ${WRKINST}${SYSCONFDIR}/courier/*.dist ${EXAMPLE_DIR}
 	@chown root:wheel ${EXAMPLE_DIR}/*
diff --git a/mail/courier-authlib/distinfo b/mail/courier-authlib/distinfo
index f3304bedd2f..7f9886057a7 100644
--- a/mail/courier-authlib/distinfo
+++ b/mail/courier-authlib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (courier-authlib-0.70.0.tar.bz2) = ATlERU2wIboIaCXvrSfohiQtlMZTIX0/orTiJKDmJI8=
-SIZE (courier-authlib-0.70.0.tar.bz2) = 2183323
+SHA256 (courier-authlib-0.71.3.tar.bz2) = muIlz1HHLz+/eRBALdSnJ+jT0q1lfMWDs4lPu015aAY=
+SIZE (courier-authlib-0.71.3.tar.bz2) = 2208794
diff --git a/mail/courier-authlib/patches/patch-Makefile_in b/mail/courier-authlib/patches/patch-Makefile_in
index 558c2dedbfb..9843a5ef8c6 100644
--- a/mail/courier-authlib/patches/patch-Makefile_in
+++ b/mail/courier-authlib/patches/patch-Makefile_in
@@ -1,53 +1,8 @@
-$OpenBSD: patch-Makefile_in,v 1.9 2020/06/01 07:17:28 giovanni Exp $
+$OpenBSD: patch-Makefile_in,v 1.10 2021/12/14 07:49:39 giovanni Exp $
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -725,7 +725,7 @@ CLEANFILES = authldaprc.h authmysqlrc.h authsqliterc.h
- 
- DISTCLEANFILES = dbobj.config README_authlib.html
- commonlibdep = libcourierauthcommon.la
--commonldflags = -module -rpath $(pkglibdir) -export-symbols-regex 'courier_auth.*_init' -avoid-version
-+commonldflags = -module -rpath $(pkglibdir) -export-symbols-regex 'courier_auth.*_init'
- commonlibadd = libcourierauthcommon.la
- libcourierauthcommon_t = @CRYPTLIBS@
- libcourierauthcommon_la_SOURCES = \
-@@ -743,7 +743,7 @@ libcourierauthcommon_la_SOURCES = \
- 
- libcourierauthcommon_la_DEPENDENCIES = libcourierauth.la
- libcourierauthcommon_la_LIBADD = libcourierauth.la
--libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t:%=-Wl,%) -avoid-version
-+libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t:%=-Wl,%)
- libcourierauth_la_SOURCES = authdaemon.c authdaemonlib.c preauthdaemon.c \
- 	authmoduser2.c authmoduser3.c debug.c \
- 	courierauthdebug.h \
-@@ -752,7 +752,7 @@ libcourierauth_la_SOURCES = authdaemon.c authdaemonlib
- libcourierauth_la_LIBADD = libs/libhmac/libhmac.la libs/md5/libmd5.la libs/sha1/libsha1.la libs/numlib/libnumlib.la \
- 	libs/random128/librandom128.la libs/rfc822/libencode.la
- 
--libcourierauth_la_LDFLAGS = @NETLIBS@ -avoid-version
-+libcourierauth_la_LDFLAGS = @NETLIBS@
- 
- # The userdb module
- libauthuserdb_t = userdb/libuserdb.la @dblibrary@ @LIBGDBM@ @LIBDB@
-@@ -854,7 +854,7 @@ libcourierauthsasl_la_SOURCES = \
- 	authsaslfrombase64.c authsasltobase64.c
- 
- libcourierauthsasl_la_LIBADD = libcourierauthcommon.la libcourierauth.la
--libcourierauthsasl_la_LDFLAGS = -export-symbols-regex '^auth_sasl|auth_sasl_ex|auth_sasl_extract_userid$$' -avoid-version
-+libcourierauthsasl_la_LDFLAGS = -export-symbols-regex '^auth_sasl|auth_sasl_ex|auth_sasl_extract_userid$$'
- libcourierauthsaslclient_la_SOURCES = courierauthsaslclient.h \
- 	authsaslclient.c authsaslclient.h authsaslclientcram.c \
- 	authsaslclientcrammd5.c authsaslclientcramsha1.c \
-@@ -863,7 +863,7 @@ libcourierauthsaslclient_la_SOURCES = courierauthsaslc
- 	authsaslfrombase64.c authsasltobase64.c
- 
- libcourierauthsaslclient_la_LIBADD = libcourierauth.la
--libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$' -avoid-version
-+libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$'
- include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \
- 	courierauthsaslclient.h courierauthdebug.h courierauthstaticlist.h
- 
-@@ -897,7 +897,7 @@ authdaemondprog_LDADD = $(LIBLTDL) libcourierauthcommo
+@@ -898,7 +898,7 @@ authdaemondprog_LDADD = $(LIBLTDL) libcourierauthcommo
  	libs/libhmac/libhmac.la libs/md5/libmd5.la libs/sha1/libsha1.la \
  	libs/rfc822/libencode.la libs/numlib/libnumlib.la
  
@@ -56,3 +11,12 @@ Index: Makefile.in
  authdaemontest_SOURCES = authdaemontest.c
  authdaemontest_DEPENDENCIES = libcourierauthcommon.la
  authdaemontest_LDADD = libcourierauthcommon.la @NETLIBS@
+@@ -2255,8 +2255,6 @@ install-exec-hook:
+ 	-chown @mailuser@ $(DESTDIR)$(pkglibexecdir)
+ 	-chgrp @mailgroup@ $(DESTDIR)$(pkglibexecdir)
+ 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond
+-	$(mkinstalldirs) $(DESTDIR)@authdaemonvar@ || :
+-	chmod 750 $(DESTDIR)@authdaemonvar@
+ 	-chown @mailuser@ $(DESTDIR)@authdaemonvar@
+ 	-chgrp @mailgroup@ $(DESTDIR)@authdaemonvar@
+ 	test "@LIBAUTHUSERDB@" = "" && exit 0 ;\
diff --git a/mail/courier-authlib/pkg/PLIST-main b/mail/courier-authlib/pkg/PLIST-main
index 644d1a6b942..51d70268ce0 100644
--- a/mail/courier-authlib/pkg/PLIST-main
+++ b/mail/courier-authlib/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.10 2019/07/08 09:46:54 giovanni Exp $
+@comment $OpenBSD: PLIST-main,v 1.11 2021/12/14 07:49:39 giovanni Exp $
 @conflict courier-authlib-*
 @pkgpath mail/courier-authlib
 @newgroup _courier:571
@@ -6,7 +6,6 @@
 @sample ${SYSCONFDIR}/courier/
 @rcscript ${RCDIR}/courier_authdaemond
 @bin bin/courierauthconfig
-include/courier_auth_config.h
 include/courierauth.h
 include/courierauthdebug.h
 include/courierauthsasl.h
@@ -36,7 +35,6 @@ include/courierauthstaticlist.h
 @lib lib/libcourierauthsaslclient.so.${LIBcourierauthsaslclient_VERSION}
 libexec/courier-authlib/
 @bin libexec/courier-authlib/authdaemond
-libexec/courier-authlib/authmigrate
 libexec/courier-authlib/authsystem.passwd
 libexec/courier-authlib/sysconftool
 @man man/man1/authpasswd.1
@@ -44,9 +42,13 @@ libexec/courier-authlib/sysconftool
 @man man/man1/courierlogger.1
 @man man/man3/auth_enumerate.3
 @man man/man3/auth_generic.3
+@man man/man3/auth_generic_meta.3
 @man man/man3/auth_getoption.3
 @man man/man3/auth_getuserinfo.3
+@man man/man3/auth_getuserinfo_meta.3
 @man man/man3/auth_login.3
+@man man/man3/auth_login_meta.3
+@man man/man3/auth_meta.3
 @man man/man3/auth_mkhomedir.3
 @man man/man3/auth_passwd.3
 @man man/man3/auth_sasl.3