diff --git a/lib/libcrypto/opensslv.h b/lib/libcrypto/opensslv.h
index 6b6e901fd..d7ce60fd3 100644
--- a/lib/libcrypto/opensslv.h
+++ b/lib/libcrypto/opensslv.h
@@ -1,11 +1,11 @@
-/* $OpenBSD: opensslv.h,v 1.76 2023/05/27 13:54:46 tb Exp $ */
+/* $OpenBSD: opensslv.h,v 1.77 2023/09/20 11:42:25 tb Exp $ */
 #ifndef HEADER_OPENSSLV_H
 #define HEADER_OPENSSLV_H
 
 /* These will change with each release of LibreSSL-portable */
-#define LIBRESSL_VERSION_NUMBER 0x3080100fL
+#define LIBRESSL_VERSION_NUMBER 0x3080200fL
 /*                                    ^ Patch starts here   */
-#define LIBRESSL_VERSION_TEXT   "LibreSSL 3.8.1"
+#define LIBRESSL_VERSION_TEXT   "LibreSSL 3.8.2"
 
 /* These will never change */
 #define OPENSSL_VERSION_NUMBER	0x20000000L
diff --git a/share/man/man5/bsd.port.mk.5 b/share/man/man5/bsd.port.mk.5
index 5da97048b..bbc992088 100644
--- a/share/man/man5/bsd.port.mk.5
+++ b/share/man/man5/bsd.port.mk.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bsd.port.mk.5,v 1.630 2023/09/16 08:01:31 op Exp $
+.\" $OpenBSD: bsd.port.mk.5,v 1.631 2023/09/19 20:50:40 tb Exp $
 .\"
 .\" Copyright (c) 2000-2008 Marc Espie
 .\"
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 16 2023 $
+.Dd $Mdocdate: September 19 2023 $
 .Dt BSD.PORT.MK 5
 .Os
 .Sh NAME
@@ -1661,7 +1661,7 @@ or
 .Sq srht
 at the moment
 .Po see
-.Pa ${PORTSDIR}/db/dist-tuple.pattern ,
+.Pa ${PORTSDIR}/infrastructure/db/dist-tuple.pattern ,
 additional
 .Ev TEMPLATE_DISTFILES.<name>
 and
diff --git a/usr.bin/awk/main.c b/usr.bin/awk/main.c
index 5a976d828..2ec0bc7d9 100644
--- a/usr.bin/awk/main.c
+++ b/usr.bin/awk/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.61 2023/09/18 19:32:19 millert Exp $	*/
+/*	$OpenBSD: main.c,v 1.62 2023/09/20 16:57:12 millert Exp $	*/
 /****************************************************************
 Copyright (C) Lucent Technologies 1997
 All Rights Reserved
@@ -170,6 +170,10 @@ int main(int argc, char *argv[])
 	yyin = NULL;
 	symtab = makesymtab(NSYMTAB);
 	while (argc > 1 && argv[1][0] == '-' && argv[1][1] != '\0') {
+		if (strcmp(argv[1], "--version") == 0) {
+			printf("awk %s\n", version);
+			return 0;
+		}
 		if (strcmp(argv[1], "--") == 0) {	/* explicit end of args */
 			argc--;
 			argv++;
@@ -214,8 +218,7 @@ int main(int argc, char *argv[])
 			break;
 		case 'V':	/* added for exptools "standard" */
 			printf("awk %s\n", version);
-			exit(0);
-			break;
+			return 0;
 		default:
 			WARNING("unknown option %s ignored", argv[1]);
 			break;
diff --git a/usr.bin/awk/run.c b/usr.bin/awk/run.c
index f90de0f13..b7397905d 100644
--- a/usr.bin/awk/run.c
+++ b/usr.bin/awk/run.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: run.c,v 1.77 2023/09/18 19:32:19 millert Exp $	*/
+/*	$OpenBSD: run.c,v 1.78 2023/09/20 16:49:13 millert Exp $	*/
 /****************************************************************
 Copyright (C) Lucent Technologies 1997
 All Rights Reserved
@@ -1981,7 +1981,7 @@ static char *nawk_convert(const char *s, int (*fun_c)(int),
 	const char *ps = NULL;
 	size_t n       = 0;
 	wchar_t wc;
-	size_t sz = MB_CUR_MAX;
+	const size_t sz = awk_mb_cur_max;
 	int unused;
 
 	if (sz == 1) {
diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8
index 222f886c5..32e591f0d 100644
--- a/usr.bin/ssh/sshd.8
+++ b/usr.bin/ssh/sshd.8
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd.8,v 1.324 2023/02/10 06:39:27 jmc Exp $
-.Dd $Mdocdate: February 10 2023 $
+.\" $OpenBSD: sshd.8,v 1.325 2023/09/19 20:37:07 deraadt Exp $
+.Dd $Mdocdate: September 19 2023 $
 .Dt SSHD 8
 .Os
 .Sh NAME
@@ -293,7 +293,7 @@ forwarding TCP connections, or forwarding the authentication agent
 connection over the secure channel.
 .Pp
 After this, the client either requests an interactive shell or execution
-or a non-interactive command, which
+of a non-interactive command, which
 .Nm
 will execute via the user's shell using its
 .Fl c