diff -ruN opensmtpd-7.7.0p0.orig/usr.sbin/smtpd/smtpc.c opensmtpd-7.7.0p0/usr.sbin/smtpd/smtpc.c
--- opensmtpd-7.7.0p0.orig/usr.sbin/smtpd/smtpc.c	2026-04-17 10:19:15.152524476 +0000
+++ opensmtpd-7.7.0p0/usr.sbin/smtpd/smtpc.c	2026-04-17 10:19:41.936756962 +0000
@@ -114,8 +114,8 @@
 			servname = value;
 			break;
 		case -1:
-			if (suboptarg)
-				fatalx("invalid TLS option \"%s\"", suboptarg);
+			//if (suboptarg)
+			//            fatalx("invalid TLS option \"%s\"", suboptarg);
 			fatalx("missing TLS option");
 		}
 	}
diff -ruN opensmtpd-7.7.0p0.orig/usr.sbin/smtpd/smtpctl.c opensmtpd-7.7.0p0/usr.sbin/smtpd/smtpctl.c
--- opensmtpd-7.7.0p0.orig/usr.sbin/smtpd/smtpctl.c	2026-04-17 10:19:15.156524511 +0000
+++ opensmtpd-7.7.0p0/usr.sbin/smtpd/smtpctl.c	2026-04-17 10:19:15.212525001 +0000
@@ -54,6 +54,8 @@
 #endif
 #include <limits.h>
 
+#include <grp.h>
+
 #include "smtpd.h"
 #include "parser.h"
 #include "log.h"
diff -ruN opensmtpd-7.7.0p0.orig/usr.sbin/smtpd/to.c opensmtpd-7.7.0p0/usr.sbin/smtpd/to.c
--- opensmtpd-7.7.0p0.orig/usr.sbin/smtpd/to.c	2026-04-17 10:19:15.156524511 +0000
+++ opensmtpd-7.7.0p0/usr.sbin/smtpd/to.c	2026-04-17 10:19:15.252525351 +0000
@@ -152,7 +152,7 @@
 time_to_text(time_t when)
 {
 	struct tm *lt;
-	static char buf[40];
+	static char buf[50];
 	const char *day[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
 	const char *month[] = {"Jan","Feb","Mar","Apr","May","Jun",
 			 "Jul","Aug","Sep","Oct","Nov","Dec"};
@@ -169,6 +169,9 @@
 #elif defined HAVE_DECL_ALTZONE && defined HAVE_DECL_TIMEZONE
 	offset = lt->tm_isdst > 0 ? altzone : timezone;
 	tz = lt->tm_isdst > 0 ? tzname[1] : tzname[0];
+#else
+	offset = 0;
+	tz = "GMT";
 #endif
 
 	/* We do not use strftime because it is subject to locale substitution*/