diff --git a/net/guacamole-server/Makefile b/net/guacamole-server/Makefile
index d913136bf256..19d180d766e0 100644
--- a/net/guacamole-server/Makefile
+++ b/net/guacamole-server/Makefile
@@ -1,99 +1,99 @@
 PORTNAME=	guacamole-server
-DISTVERSION=	1.4.0
+DISTVERSION=	1.5.0
 CATEGORIES=	net
 
 MAINTAINER=	ultima@FreeBSD.org
 COMMENT=	HTML5 Clientless Remote Desktop
 WWW=		https://guacamole.incubator.apache.org
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libossp-uuid.so:misc/ossp-uuid \
 		libpng.so:graphics/png
 
 CONFLICTS_BUILD=pulseaudio-*+jack_* ffmpeg-*+jack_*
 
 USES=		autoreconf compiler:c11 gnome jpeg libtool localbase pkgconfig \
 		shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	apache
 
 USE_GNOME=	cairo
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	guacd
 SHEBANG_FILES=	${WRKSRC}/src/protocols/rdp/keymaps/generate.pl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-guacd-conf=${ETCDIR}/guacd.conf
 INSTALL_TARGET=	install-strip
 
 GUACAMOLE_HOME?=	${PREFIX}/guacamole
 USERS=		guacamole
 GROUPS=		guacamole
 
 SUB_LIST=	GUACD_USER=${USERS} \
 		GUACD_GROUP=${GROUPS} \
 		GUACD_HOME=${GUACAMOLE_HOME}
 
 PLIST_SUB=	GUACD_USER=${USERS} \
 		GUACD_GROUP=${GROUPS} \
 		GUACD_HOME=${GUACAMOLE_HOME}
 
 OPTIONS_DEFINE=		GUACENC GUACLOG NLS SSL WEBP
 OPTIONS_DEFAULT=	GUACENC GUACLOG KUBERNETES PULSEAUDIO RDP \
 			SSH SSL VNC VORBIS WEBP
 OPTIONS_GROUP=		SP AUDIO
 OPTIONS_GROUP_SP=	KUBERNETES RDP SSH VNC
 OPTIONS_GROUP_AUDIO=	VORBIS PULSEAUDIO
 OPTIONS_SUB=		yes
 
 AUDIO_DESC=		Audio Support
 GUACENC_DESC=		Video Encoding Utility
 GUACLOG_DESC=		Input log interpreter
 KUBERNETES_DESC=	Kubernetes protocol support
 RDP_DESC=		RDP protocol support
 SP_DESC=		Supported Protocols
 VNC_DESC=		VNC protocol support
 
 GUACENC_CONFIGURE_ENABLE=	guacenc
 GUACENC_CONFIGURE_WITH=		libavcodec libavutil libswscale
 GUACENC_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 GUACENC_CFLAGS=		-Wno-error=deprecated
 GUACLOG_CONFIGURE_ENABLE=	guaclog
 KUBERNETES_CONFIGURE_ENABLE=	kubernetes
 KUBERNETES_CONFIGURE_WITH=	pango terminal
 KUBERNETES_LIB_DEPENDS=		libwebsockets.so:net/libwebsockets
 KUBERNETES_USE=			GNOME=pango
 NLS_USES=		gettext-runtime
 PULSEAUDIO_CONFIGURE_WITH=	pulse
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 RDP_CONFIGURE_WITH=	rdp
 RDP_LIB_DEPENDS=	libfreerdp2.so:net/freerdp
 SSH_CONFIGURE_WITH=	pango ssh terminal
 SSH_IMPLIES=		SSL
 SSH_LIB_DEPENDS=	libssh2.so:security/libssh2
 SSH_USE=		GNOME=pango
 SSL_CONFIGURE_WITH=	ssl
 SSL_USES=		ssl
 VNC_CONFIGURE_WITH=	vnc
 VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
 VORBIS_CONFIGURE_WITH=	vorbis
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 			libogg.so:audio/libogg
 WEBP_CONFIGURE_WITH=	webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 
 post-patch:
 	@${REINPLACE_CMD} 's/-Werror//' ${WRKSRC}/src/libguac/Makefile.am \
 		${WRKSRC}/src/protocols/vnc/Makefile.am
 	@${REINPLACE_CMD} 's|/etc/ssl|${PREFIX}/etc/ssl|g ; \
 			 s|/etc/guacamole|${ETCDIR}|g' \
 			 ${WRKSRC}/src/guacd/man/guacd.conf.5.in
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${GUACAMOLE_HOME}
 	${INSTALL_DATA} ${FILESDIR}/guacd.conf.sample ${STAGEDIR}${ETCDIR}
 
 .include <bsd.port.mk>
diff --git a/net/guacamole-server/distinfo b/net/guacamole-server/distinfo
index c7238ad68f93..fb4a0a5d296e 100644
--- a/net/guacamole-server/distinfo
+++ b/net/guacamole-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641668633
-SHA256 (apache-guacamole-server-1.4.0_GH0.tar.gz) = 4646b7850828aa8f35d69308656479b3a4855cafbe6673ae575c0e282d298846
-SIZE (apache-guacamole-server-1.4.0_GH0.tar.gz) = 550354
+TIMESTAMP = 1676996246
+SHA256 (apache-guacamole-server-1.5.0_GH0.tar.gz) = f300427bf5119d85ea3831039211474e643c15617a8fb064afb0ed02e2b123b0
+SIZE (apache-guacamole-server-1.5.0_GH0.tar.gz) = 554772
diff --git a/net/guacamole-server/pkg-plist b/net/guacamole-server/pkg-plist
index 1db6fc48bb75..352e1efc5af6 100644
--- a/net/guacamole-server/pkg-plist
+++ b/net/guacamole-server/pkg-plist
@@ -1,75 +1,81 @@
 %%GUACENC%%bin/guacenc
 %%GUACLOG%%bin/guaclog
 %%ETCDIR%%/guacd.conf.sample
 include/guacamole/argv-constants.h
 include/guacamole/argv-fntypes.h
 include/guacamole/argv.h
 include/guacamole/audio-fntypes.h
 include/guacamole/audio-types.h
 include/guacamole/audio.h
 include/guacamole/client-constants.h
 include/guacamole/client-fntypes.h
 include/guacamole/client-types.h
 include/guacamole/client.h
 include/guacamole/error-types.h
 include/guacamole/error.h
 include/guacamole/hash.h
 include/guacamole/layer-types.h
 include/guacamole/layer.h
 include/guacamole/object-types.h
 include/guacamole/object.h
 include/guacamole/parser-constants.h
 include/guacamole/parser-types.h
 include/guacamole/parser.h
 include/guacamole/plugin-constants.h
 include/guacamole/plugin.h
 include/guacamole/pool-types.h
 include/guacamole/pool.h
 include/guacamole/protocol-constants.h
 include/guacamole/protocol-types.h
 include/guacamole/protocol.h
+include/guacamole/recording.h
 include/guacamole/socket-constants.h
 include/guacamole/socket-fntypes.h
 %%SSL%%include/guacamole/socket-ssl.h
 include/guacamole/socket-types.h
 include/guacamole/socket.h
 include/guacamole/stream-types.h
 include/guacamole/stream.h
 include/guacamole/string.h
+include/guacamole/terminal/terminal.h
 include/guacamole/timestamp-types.h
 include/guacamole/timestamp.h
 include/guacamole/unicode.h
 include/guacamole/user-constants.h
 include/guacamole/user-fntypes.h
 include/guacamole/user-types.h
 include/guacamole/user.h
 include/guacamole/wol-constants.h
 include/guacamole/wol.h
 %%RDP%%lib/freerdp2/libguac-common-svc-client.so
 %%RDP%%lib/freerdp2/libguacai-client.so
 %%KUBERNETES%%lib/libguac-client-kubernetes.a
 %%KUBERNETES%%lib/libguac-client-kubernetes.so
 %%KUBERNETES%%lib/libguac-client-kubernetes.so.0
 %%KUBERNETES%%lib/libguac-client-kubernetes.so.0.0.0
 %%RDP%%lib/libguac-client-rdp.a
 %%RDP%%lib/libguac-client-rdp.so
 %%RDP%%lib/libguac-client-rdp.so.0
 %%RDP%%lib/libguac-client-rdp.so.0.0.0
 %%SSH%%lib/libguac-client-ssh.a
 %%SSH%%lib/libguac-client-ssh.so
 %%SSH%%lib/libguac-client-ssh.so.0
 %%SSH%%lib/libguac-client-ssh.so.0.0.0
 %%VNC%%lib/libguac-client-vnc.a
 %%VNC%%lib/libguac-client-vnc.so
 %%VNC%%lib/libguac-client-vnc.so.0
 %%VNC%%lib/libguac-client-vnc.so.0.0.0
 lib/libguac.a
 lib/libguac.so
-lib/libguac.so.20
-lib/libguac.so.20.0.0
+lib/libguac.so.21
+lib/libguac.so.21.0.0
+lib/libguac-terminal.a
+lib/libguac-terminal.so
+lib/libguac-terminal.so.0
+lib/libguac-terminal.so.0.0.0
 %%GUACENC%%man/man1/guacenc.1.gz
 %%GUACLOG%%man/man1/guaclog.1.gz
 man/man5/guacd.conf.5.gz
 man/man8/guacd.8.gz
 sbin/guacd
 @dir(%%GUACD_USER%%,%%GUACD_GROUP%%,) %%GUACD_HOME%%
diff --git a/www/guacamole-client/Makefile b/www/guacamole-client/Makefile
index 6fc1d4b4c724..0c9a8ceeb468 100644
--- a/www/guacamole-client/Makefile
+++ b/www/guacamole-client/Makefile
@@ -1,64 +1,66 @@
 PORTNAME=	guacamole-client
-DISTVERSION=	1.4.0
+DISTVERSION=	1.5.0
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	guacamole/${DISTVERSIONFULL}/binary
 DISTFILES=	guacamole-${DISTVERSIONFULL}.war \
 		guacamole-auth-duo-${DISTVERSIONFULL}${EXTRACT_SUFX} \
 		guacamole-auth-header-${DISTVERSIONFULL}${EXTRACT_SUFX} \
 		guacamole-auth-jdbc-${DISTVERSIONFULL}${EXTRACT_SUFX} \
 		guacamole-auth-json-${DISTVERSIONFULL}${EXTRACT_SUFX} \
 		guacamole-auth-ldap-${DISTVERSIONFULL}${EXTRACT_SUFX} \
 		guacamole-auth-quickconnect-${DISTVERSIONFULL}${EXTRACT_SUFX} \
 		guacamole-auth-sso-${DISTVERSIONFULL}${EXTRACT_SUFX} \
-		guacamole-auth-totp-${DISTVERSIONFULL}${EXTRACT_SUFX}
+		guacamole-auth-totp-${DISTVERSIONFULL}${EXTRACT_SUFX} \
+		guacamole-history-recording-storage-${DISTVERSIONFULL}${EXTRACT_SUFX} \
+		guacamole-vault-${DISTVERSIONFULL}${EXTRACT_SUFX}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ultima@FreeBSD.org
 COMMENT=	HTML5 Clientless Remote Desktop
 WWW=		https://guacamole.incubator.apache.org
 
 LICENSE=	APACHE20
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		SERVER TOMCAT
 OPTIONS_DEFAULT=	SERVER TOMCAT
 OPTIONS_SUB=		yes
 
 SERVER_DESC=		Include Guacamole Server
 TOMCAT_DESC=		Use Tomcat as your servlet
 
 TOMCAT_PLIST_SUB=	TOMCAT_VER=${TOMCAT_VER}
 TOMCAT_RUN_DEPENDS=	${LOCALBASE}/apache-tomcat-${TOMCAT_VER}/bin/bootstrap.jar:www/tomcat${TOMCAT_VER:C/\.[0]?//}
 TOMCAT_VARS=		TOMCAT_VER=9.0
 
 SERVER_RUN_DEPENDS=	guacd:net/guacamole-server
 
 do-extract:
 
 do-install:
 		@${MKDIR} ${STAGEDIR}${DATADIR}
 		@${MKDIR} ${STAGEDIR}${ETCDIR}
 		@${MKDIR} ${STAGEDIR}/etc
 
 		${INSTALL_DATA} ${_DISTDIR}/${DISTFILES:M*.war} \
 			${STAGEDIR}${DATADIR}/guacamole.war
 .for i in ${DISTFILES:N*.war}
 		${INSTALL_DATA} ${_DISTDIR}/${i}${DISTVERSIONFULL}${EXTRACT_SUFX} \
 			${STAGEDIR}/${DATADIR}/${i:S|-$||}${EXTRACT_SUFX}
 .endfor
 		${INSTALL_DATA} ${FILESDIR}/user-mapping.xml.sample ${STAGEDIR}${ETCDIR}/
 		${INSTALL_DATA} ${FILESDIR}/logback.xml.sample ${STAGEDIR}${ETCDIR}/
 		${INSTALL_DATA} ${FILESDIR}/guacamole.properties.sample ${STAGEDIR}${ETCDIR}/
 		${RLN} ${STAGEDIR}${ETCDIR} ${STAGEDIR}/etc/guacamole
 
 do-install-TOMCAT-on:
 		@${MKDIR} ${STAGEDIR}${PREFIX}/apache-tomcat-${TOMCAT_VER}/webapps
 		${RLN} ${STAGEDIR}${DATADIR}/guacamole.war \
 			${STAGEDIR}${PREFIX}/apache-tomcat-${TOMCAT_VER}/webapps
 
 .include <bsd.port.mk>
diff --git a/www/guacamole-client/distinfo b/www/guacamole-client/distinfo
index 936efd124509..9e24b72c8741 100644
--- a/www/guacamole-client/distinfo
+++ b/www/guacamole-client/distinfo
@@ -1,19 +1,23 @@
-TIMESTAMP = 1641761453
-SHA256 (guacamole-client/guacamole-1.4.0.war) = 92fb06e3ce8fe4f932ddfdffd75a352c06ab58d3bd0a946faa5beda73e8592f0
-SIZE (guacamole-client/guacamole-1.4.0.war) = 13011205
-SHA256 (guacamole-client/guacamole-auth-duo-1.4.0.tar.gz) = 62917e25cb9b6c7e08c5e13da43308469fa58ab317cd7e1f9e140ec94e4a2fda
-SIZE (guacamole-client/guacamole-auth-duo-1.4.0.tar.gz) = 3596849
-SHA256 (guacamole-client/guacamole-auth-header-1.4.0.tar.gz) = 3f5491737b3295056949d235120dca60ee9518c951b09271780dddf15166a9de
-SIZE (guacamole-client/guacamole-auth-header-1.4.0.tar.gz) = 3566935
-SHA256 (guacamole-client/guacamole-auth-jdbc-1.4.0.tar.gz) = 47f4f121cad74ab64d5baf3d14e8f709677a26b3058005a977277a07716d4d9c
-SIZE (guacamole-client/guacamole-auth-jdbc-1.4.0.tar.gz) = 16486378
-SHA256 (guacamole-client/guacamole-auth-json-1.4.0.tar.gz) = 7398f04ae1630c93249edb4f0f267ca43b3ba66722f23d13e05acf7d79a80468
-SIZE (guacamole-client/guacamole-auth-json-1.4.0.tar.gz) = 11511282
-SHA256 (guacamole-client/guacamole-auth-ldap-1.4.0.tar.gz) = f28488717b26168a5396e125ec7fbff1b7268a658c6100f6ad1bbfbd18a17779
-SIZE (guacamole-client/guacamole-auth-ldap-1.4.0.tar.gz) = 9575832
-SHA256 (guacamole-client/guacamole-auth-quickconnect-1.4.0.tar.gz) = 5c4f6c5d581b7420bf658d16be585a9ef4499c3dabac14ac4289b73640665117
-SIZE (guacamole-client/guacamole-auth-quickconnect-1.4.0.tar.gz) = 3584581
-SHA256 (guacamole-client/guacamole-auth-sso-1.4.0.tar.gz) = 55ef6adac3beb753361b67eadda1c789ce3ffc70fe74794e9ddef70d8e6b8b8c
-SIZE (guacamole-client/guacamole-auth-sso-1.4.0.tar.gz) = 22414937
-SHA256 (guacamole-client/guacamole-auth-totp-1.4.0.tar.gz) = 4c4c5390eecb68d1df07e15fa25829e51a079d4a83887c5e417ac8d7419e787b
-SIZE (guacamole-client/guacamole-auth-totp-1.4.0.tar.gz) = 4769666
+TIMESTAMP = 1677182160
+SHA256 (guacamole-client/guacamole-1.5.0.war) = 9c4e807aa70bc138f3b6cc66cc44b75daa944a015944b9ab6f780d7868498620
+SIZE (guacamole-client/guacamole-1.5.0.war) = 13381408
+SHA256 (guacamole-client/guacamole-auth-duo-1.5.0.tar.gz) = 8458e1496224dbc350eab56de2dcce92d041e3cb58979b98b4670a70514928d4
+SIZE (guacamole-client/guacamole-auth-duo-1.5.0.tar.gz) = 3585252
+SHA256 (guacamole-client/guacamole-auth-header-1.5.0.tar.gz) = 15f37da79723d8ea74bc24262cf404840c023a3b5dbe3823dbf3b1915cda9df6
+SIZE (guacamole-client/guacamole-auth-header-1.5.0.tar.gz) = 3555492
+SHA256 (guacamole-client/guacamole-auth-jdbc-1.5.0.tar.gz) = f47e066c4d3167202b9c866f63cba806f2cb0a00a5c00847e07870b124b5fb75
+SIZE (guacamole-client/guacamole-auth-jdbc-1.5.0.tar.gz) = 32322210
+SHA256 (guacamole-client/guacamole-auth-json-1.5.0.tar.gz) = b3464e6d9e2fd4559884495d5bfa450472c82b4d700393c86153a3e7c5df8e2c
+SIZE (guacamole-client/guacamole-auth-json-1.5.0.tar.gz) = 11853927
+SHA256 (guacamole-client/guacamole-auth-ldap-1.5.0.tar.gz) = 4a97a6c88f5e27920725178abd154aa709498c9d0bbcfee835be448202037497
+SIZE (guacamole-client/guacamole-auth-ldap-1.5.0.tar.gz) = 12172842
+SHA256 (guacamole-client/guacamole-auth-quickconnect-1.5.0.tar.gz) = f6702fc82cf36f8e4d3026ca23847b60df9cc2c1e22f7596c02ef5b4cd9f8d09
+SIZE (guacamole-client/guacamole-auth-quickconnect-1.5.0.tar.gz) = 3572059
+SHA256 (guacamole-client/guacamole-auth-sso-1.5.0.tar.gz) = c387da2b93224dd8e3a3b832b740e5b859d71ac4a93e95aa7edd41934112b862
+SIZE (guacamole-client/guacamole-auth-sso-1.5.0.tar.gz) = 33827739
+SHA256 (guacamole-client/guacamole-auth-totp-1.5.0.tar.gz) = c703f7c541f5a513c1588a5bedeae4461cd4135b11d6eb874ac059f48445942f
+SIZE (guacamole-client/guacamole-auth-totp-1.5.0.tar.gz) = 4822909
+SHA256 (guacamole-client/guacamole-history-recording-storage-1.5.0.tar.gz) = bdbbd43299560b775066d3be60044ad95f27f72e5a810c257d356c4a6e936130
+SIZE (guacamole-client/guacamole-history-recording-storage-1.5.0.tar.gz) = 15898
+SHA256 (guacamole-client/guacamole-vault-1.5.0.tar.gz) = 73b49e1c970e4cffbd5fe5cd8eeb8f3587d1bbf7cd6b52a3dfcfda11b00fb5af
+SIZE (guacamole-client/guacamole-vault-1.5.0.tar.gz) = 20508930
diff --git a/www/guacamole-client/pkg-plist b/www/guacamole-client/pkg-plist
index e8bc0fac9404..b20361489392 100644
--- a/www/guacamole-client/pkg-plist
+++ b/www/guacamole-client/pkg-plist
@@ -1,14 +1,16 @@
 /etc/guacamole
 %%TOMCAT%%apache-tomcat-%%TOMCAT_VER%%/webapps/guacamole.war
 %%ETCDIR%%/guacamole.properties.sample
 %%ETCDIR%%/logback.xml.sample
 %%ETCDIR%%/user-mapping.xml.sample
 %%DATADIR%%/guacamole-auth-duo.tar.gz
 %%DATADIR%%/guacamole-auth-header.tar.gz
 %%DATADIR%%/guacamole-auth-jdbc.tar.gz
 %%DATADIR%%/guacamole-auth-json.tar.gz
 %%DATADIR%%/guacamole-auth-ldap.tar.gz
 %%DATADIR%%/guacamole-auth-quickconnect.tar.gz
 %%DATADIR%%/guacamole-auth-sso.tar.gz
 %%DATADIR%%/guacamole-auth-totp.tar.gz
+%%DATADIR%%/guacamole-history-recording-storage.tar.gz
+%%DATADIR%%/guacamole-vault.tar.gz
 %%DATADIR%%/guacamole.war