diff --git a/net/guacamole-server/Makefile b/net/guacamole-server/Makefile
index 6bd648685e7a..ec6af2c46189 100644
--- a/net/guacamole-server/Makefile
+++ b/net/guacamole-server/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	guacamole-server
-DISTVERSION=	1.5.4
-PORTREVISION=	2
+DISTVERSION=	1.5.5
 CATEGORIES=	net
 MASTER_SITES=	APACHE/guacamole/${DISTVERSION}/source/
 
diff --git a/net/guacamole-server/distinfo b/net/guacamole-server/distinfo
index 707209358a51..1e6e2036c4d3 100644
--- a/net/guacamole-server/distinfo
+++ b/net/guacamole-server/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1704918080
-SHA256 (guacamole-server-1.5.4.tar.gz) = 4c0add552b1fc387c23a35c430155e01f2dfcf9daa0f96fbf805d0ace756729e
-SIZE (guacamole-server-1.5.4.tar.gz) = 1126881
+TIMESTAMP = 1739487171
+SHA256 (guacamole-server-1.5.5.tar.gz) = 67499611c2e22d9c933763adc5408e716a4bfd08a3eb8a5ba2fc6f8f70868f6b
+SIZE (guacamole-server-1.5.5.tar.gz) = 1136892
 SHA256 (5cf408ebbba9544fb5dfb297d98d5a1e1751a56d.patch) = fe104f8eeade04051b1ba86ecb69307dc172746b11c10892dd24ea4a8593d083
 SIZE (5cf408ebbba9544fb5dfb297d98d5a1e1751a56d.patch) = 3222
diff --git a/www/guacamole-client/Makefile b/www/guacamole-client/Makefile
index 51dc54b9acc7..61fe4e81ec2c 100644
--- a/www/guacamole-client/Makefile
+++ b/www/guacamole-client/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	guacamole-client
-DISTVERSION=	1.5.4
+DISTVERSION=	1.5.5
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	guacamole/${DISTVERSIONFULL}/binary
diff --git a/www/guacamole-client/distinfo b/www/guacamole-client/distinfo
index 51de89e5333a..0300255aae27 100644
--- a/www/guacamole-client/distinfo
+++ b/www/guacamole-client/distinfo
@@ -1,23 +1,23 @@
-TIMESTAMP = 1704918122
-SHA256 (guacamole-client/guacamole-1.5.4.war) = 5728b563911bd64bce0a0b81c74ea8ccb2190d1785bff34030fc6885a8273d3e
-SIZE (guacamole-client/guacamole-1.5.4.war) = 13734589
-SHA256 (guacamole-client/guacamole-auth-duo-1.5.4.tar.gz) = eb0cd4c361b91710f3c03fe9e7c74799c48d8b7c105d4f3e7deb2dc6049a309e
-SIZE (guacamole-client/guacamole-auth-duo-1.5.4.tar.gz) = 3679857
-SHA256 (guacamole-client/guacamole-auth-header-1.5.4.tar.gz) = 7a0adc0daa19ec69a0244f491222c62124b02f81f40aa91e9a94d06a2635d038
-SIZE (guacamole-client/guacamole-auth-header-1.5.4.tar.gz) = 3650061
-SHA256 (guacamole-client/guacamole-auth-jdbc-1.5.4.tar.gz) = f45736b28eb6647b7eb0d2b48331e12e5a432661f61115b63d1a05a5bd20244d
-SIZE (guacamole-client/guacamole-auth-jdbc-1.5.4.tar.gz) = 32963118
-SHA256 (guacamole-client/guacamole-auth-json-1.5.4.tar.gz) = 25db39d87d449740ce47c26983f82521642486d6996beed4deef4dd64dc60ddd
-SIZE (guacamole-client/guacamole-auth-json-1.5.4.tar.gz) = 6620553
-SHA256 (guacamole-client/guacamole-auth-ldap-1.5.4.tar.gz) = f912fe921cd0d429a752709e31a37b931e95d88a47bc4007ab49377d1c1a6336
-SIZE (guacamole-client/guacamole-auth-ldap-1.5.4.tar.gz) = 13219125
-SHA256 (guacamole-client/guacamole-auth-quickconnect-1.5.4.tar.gz) = 6ef8d8a239fcbb055eface4fc5941a16b549ef4f560cb428d9acb1aae9e4ee98
-SIZE (guacamole-client/guacamole-auth-quickconnect-1.5.4.tar.gz) = 3666619
-SHA256 (guacamole-client/guacamole-auth-sso-1.5.4.tar.gz) = d8aa6dbb4c9104f6c5fab7843b23b50c32b844f67c9534e316b8d0e5df8cfcea
-SIZE (guacamole-client/guacamole-auth-sso-1.5.4.tar.gz) = 34613153
-SHA256 (guacamole-client/guacamole-auth-totp-1.5.4.tar.gz) = 0615bbf61802c9527a1503bd45d1911b26b2ae77d1c25dabfe826ed1acd723a0
-SIZE (guacamole-client/guacamole-auth-totp-1.5.4.tar.gz) = 4924784
-SHA256 (guacamole-client/guacamole-history-recording-storage-1.5.4.tar.gz) = f68d6534292d98497ab9ba94333e34b45b67c24412a5b954d76c7317a06bc0cf
-SIZE (guacamole-client/guacamole-history-recording-storage-1.5.4.tar.gz) = 15891
-SHA256 (guacamole-client/guacamole-vault-1.5.4.tar.gz) = 2822a92660754de37987ca4cd9e6ef68d9e013348364850e26a8c28c46662caf
-SIZE (guacamole-client/guacamole-vault-1.5.4.tar.gz) = 21123468
+TIMESTAMP = 1739487208
+SHA256 (guacamole-client/guacamole-1.5.5.war) = 4267307f3600663723f24af92d596e99c8359425315135052a42d451f9529200
+SIZE (guacamole-client/guacamole-1.5.5.war) = 17401039
+SHA256 (guacamole-client/guacamole-auth-duo-1.5.5.tar.gz) = 36419b294847e2e8ae0c54e7080f0c082da8aa946614774ba1a5d059533ebf5f
+SIZE (guacamole-client/guacamole-auth-duo-1.5.5.tar.gz) = 3679932
+SHA256 (guacamole-client/guacamole-auth-header-1.5.5.tar.gz) = a39ca9563be6d31b4dc1251c76a62baeb2a9d4930b3055e342bb9ce80e526a78
+SIZE (guacamole-client/guacamole-auth-header-1.5.5.tar.gz) = 3650107
+SHA256 (guacamole-client/guacamole-auth-jdbc-1.5.5.tar.gz) = 80cca0a02076babad0dc7c76b60daa896f3d9bf10be82708f425fd42ce411393
+SIZE (guacamole-client/guacamole-auth-jdbc-1.5.5.tar.gz) = 33099128
+SHA256 (guacamole-client/guacamole-auth-json-1.5.5.tar.gz) = 3efb29583e03e01b96f3bce077c7d5bec3ec2fcbf307f112e31d8ac9d01b330d
+SIZE (guacamole-client/guacamole-auth-json-1.5.5.tar.gz) = 10320319
+SHA256 (guacamole-client/guacamole-auth-ldap-1.5.5.tar.gz) = 01d3cd74da5de9da9cc73a788ab2938dd44f5cbe42ad90eebb4bee07f246dfa3
+SIZE (guacamole-client/guacamole-auth-ldap-1.5.5.tar.gz) = 16892997
+SHA256 (guacamole-client/guacamole-auth-quickconnect-1.5.5.tar.gz) = 4786aa97558765013986e38616f4cf508fb771ddfc31708a7adbcf08c4453aec
+SIZE (guacamole-client/guacamole-auth-quickconnect-1.5.5.tar.gz) = 3666843
+SHA256 (guacamole-client/guacamole-auth-sso-1.5.5.tar.gz) = b0ef76d3e661f95c2dbe46a17a9ce8a1b8d4100727458fa55e0635a85d37add8
+SIZE (guacamole-client/guacamole-auth-sso-1.5.5.tar.gz) = 38286364
+SHA256 (guacamole-client/guacamole-auth-totp-1.5.5.tar.gz) = 37f2f9d89b68dbcb44e5349e30474a38d79224dbeb0a67f03ecfe787a5feaf42
+SIZE (guacamole-client/guacamole-auth-totp-1.5.5.tar.gz) = 4923857
+SHA256 (guacamole-client/guacamole-history-recording-storage-1.5.5.tar.gz) = 2524ad78603f6d34ef6020c0635c5ae819941d4cbb0e01d8db185f67db6ebce5
+SIZE (guacamole-client/guacamole-history-recording-storage-1.5.5.tar.gz) = 15894
+SHA256 (guacamole-client/guacamole-vault-1.5.5.tar.gz) = 382a5e1739f82eb9a17e40190d76e7ceaa3c317cf8ea8a32c60e3f7b5fa9470e
+SIZE (guacamole-client/guacamole-vault-1.5.5.tar.gz) = 28569114