diff --git a/net/gemserv/Makefile b/net/gemserv/Makefile
index 7ea90dc595f1..c9802bd1d24e 100644
--- a/net/gemserv/Makefile
+++ b/net/gemserv/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	gemserv
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4.5
+PORTREVISION=   1
 CATEGORIES=	net
 MASTER_SITES=	https://git.sr.ht/~int80h/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
 DISTFILES=	${PORTNAME}-${DISTVERSIONPREFIX}${PORTVERSION}${EXTRACT_SUFX}
@@ -112,6 +113,12 @@ STATICONLY_VARS=	CARGO_FEATURES+=--no-default-features
 GEMSERV_GROUP?=	gemserv
 GEMSERV_USER?=	gemserv
 
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085
+BROKEN=         Gemserv requires Openssl 1.1.1, upgrade to FreeBSD 12.x/13.x
+.endif
+
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/config.toml ${STAGEDIR}${ETCDIR}/config.toml-dist
@@ -126,4 +133,4 @@ post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/gemini/gemserv-dist
 	${INSTALL_DATA} ${WRKDIR}/index.gmi.sample ${STAGEDIR}${EXAMPLESDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/gemserv/files/gemserv.in b/net/gemserv/files/gemserv.in
index b1fcb394f1ed..fd8151a51147 100644
--- a/net/gemserv/files/gemserv.in
+++ b/net/gemserv/files/gemserv.in
@@ -10,9 +10,9 @@
 # gemserv_enable (bool):		Set to NO by default.
 #					Set it to YES to enable gemserv.
 # gemserv_user (user):			Set user to run gemserv.
-#					Default: _gemini
+#					Default: %%GEMSERV_USER%%
 # gemserv_group (group):		Set group to run gemserv.
-#					Default: _gemini
+#					Default: %%GEMSERV_GROUP%%
 # gemserv_config (path):		Set to %%ETCDIR%%/config.toml
 #					by default.
 # gemserv_syslog_output_enable:		Set to enable syslog output.
diff --git a/net/gemserv/pkg-message b/net/gemserv/pkg-message
index a85be73bb969..ea6959ac5e23 100644
--- a/net/gemserv/pkg-message
+++ b/net/gemserv/pkg-message
@@ -21,7 +21,7 @@ Quick Start:
                          -x509 -days 36500 -out /usr/local/etc/gemserv/cert.pem \
       -subj "/C=FR/ST=FR/L=FR/O=example.net/OU=IT/CN=gemini.example.net/emailAddress=root@example.net"
 
-    chown _gemini /usr/local/etc/gemserv/key.pem
+    chown gemserv /usr/local/etc/gemserv/key.pem
 
 3) sysrc gemserv_enable=YES
 4) service gemserv start