diff --git a/sysutils/tmate/Makefile b/sysutils/tmate/Makefile
index 26e22ed5ef0a..41d47d85ab37 100644
--- a/sysutils/tmate/Makefile
+++ b/sysutils/tmate/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	tmate
 PORTVERSION=	2.4.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	swills@FreeBSD.org
diff --git a/sysutils/tmate/pkg-message b/sysutils/tmate/pkg-message
new file mode 100644
index 000000000000..33ac3f8e4da0
--- /dev/null
+++ b/sysutils/tmate/pkg-message
@@ -0,0 +1,20 @@
+[
+{ type: install
+  message: <<EOM
+When trying to connect to the default public tmate server it may happpen that
+the following errors messages will be printed:
+
+  Connecting to ssh.tmate.io...
+  Cannot authenticate server
+  Reconnecting... (Cannot authenticate server)
+
+This is because the fingerprints of the default tmate server keys are stripped
+out from the tmate binary.
+
+Instead, users are encouraged to specify the fingerprints via ~/.tmate.conf, e.g.:
+
+  set -g tmate-server-rsa-fingerprint   "SHA256:Hthk2T/M/Ivqfk1YYUn5ijC2Att3+UPzD7Rn72P5VWs"
+  set -g tmate-server-ecdsa-fingerprint "SHA256:8GmKHYHEJ6n0TEdciHeEGkKOigQfCFuBULdt6vZIhDc"
+EOM
+}
+]