diff --git a/net/guacamole-server/Makefile b/net/guacamole-server/Makefile
index e312a2cfec81..94ca7dea5987 100644
--- a/net/guacamole-server/Makefile
+++ b/net/guacamole-server/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	guacamole-server
-DISTVERSION=	1.1.0
-PORTREVISION=	1
+DISTVERSION=	1.2.0
 CATEGORIES=	net
 
 MAINTAINER=	ultima@FreeBSD.org
@@ -88,6 +87,7 @@ WEBP_CONFIGURE_WITH=	webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 
 post-patch:
+	@${REINPLACE_CMD} 's/-Werror//' ${WRKSRC}/src/libguac/Makefile.am
 	@${REINPLACE_CMD} 's|/etc/ssl|${PREFIX}/etc/ssl|g ; \
 			 s|/etc/guacamole|${ETCDIR}|g' \
 			 ${WRKSRC}/src/guacd/man/guacd.conf.5.in
diff --git a/net/guacamole-server/distinfo b/net/guacamole-server/distinfo
index 1126f24605b6..dab638ec1d1b 100644
--- a/net/guacamole-server/distinfo
+++ b/net/guacamole-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581290732
-SHA256 (apache-guacamole-server-1.1.0_GH0.tar.gz) = d0f0c66ebfa7a4fd6689ae5240f21797b5177945a042388b691b15b8bd5c81a8
-SIZE (apache-guacamole-server-1.1.0_GH0.tar.gz) = 502009
+TIMESTAMP = 1594877637
+SHA256 (apache-guacamole-server-1.2.0_GH0.tar.gz) = 31212aa115a326030ccb58c76a77554a60c2c8bcdf285baab22af9f2a043bb06
+SIZE (apache-guacamole-server-1.2.0_GH0.tar.gz) = 523137
diff --git a/net/guacamole-server/pkg-plist b/net/guacamole-server/pkg-plist
index b2c9dbb3018f..39972d9a2362 100644
--- a/net/guacamole-server/pkg-plist
+++ b/net/guacamole-server/pkg-plist
@@ -40,6 +40,8 @@ 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
@@ -61,7 +63,7 @@ include/guacamole/user.h
 lib/libguac.a
 lib/libguac.so
 lib/libguac.so.17
-lib/libguac.so.17.0.0
+lib/libguac.so.17.1.0
 %%GUACENC%%man/man1/guacenc.1.gz
 %%GUACLOG%%man/man1/guaclog.1.gz
 man/man5/guacd.conf.5.gz
diff --git a/www/guacamole-client/Makefile b/www/guacamole-client/Makefile
index ec417ddf5f14..cf7f719c6b1e 100644
--- a/www/guacamole-client/Makefile
+++ b/www/guacamole-client/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	guacamole-client
-DISTVERSION=	1.1.0
+DISTVERSION=	1.2.0
 CATEGORIES=	www java
 MASTER_SITES+=	https://sourceforge.net/projects/distfiles/files/${PORTNAME}/:repo \
 		http://sourceforge.net/projects/distfiles/files/${PORTNAME}/:repo
@@ -43,7 +43,7 @@ TOMCAT_VARS=		TOMCAT_VER=9.0
 
 SERVER_RUN_DEPENDS=	guacd:net/guacamole-server
 
-AUTH_EXTENSION=	cas duo header ldap openid quickconnect totp
+AUTH_EXTENSION=	cas duo header ldap openid quickconnect saml totp
 
 post-patch:
 		@${REINPLACE_CMD} 's|/etc/guacamole|${ETCDIR}| ; \
diff --git a/www/guacamole-client/distinfo b/www/guacamole-client/distinfo
index e97647989d0e..7da5f731c3a2 100644
--- a/www/guacamole-client/distinfo
+++ b/www/guacamole-client/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1581312334
-SHA256 (guacamole-client/repository-1.1.0.tar.xz) = d744383a1f195cb4c5c431cf72e27f16232dcd150289a457dbe1f86cb4af0620
-SIZE (guacamole-client/repository-1.1.0.tar.xz) = 61660412
-SHA256 (guacamole-client/apache-guacamole-client-1.1.0_GH0.tar.gz) = be34e5afd1518e8e7e42233544efc7642f0a3388c76fee0ca16568485655ce11
-SIZE (guacamole-client/apache-guacamole-client-1.1.0_GH0.tar.gz) = 6034631
+TIMESTAMP = 1594924532
+SHA256 (guacamole-client/repository-1.2.0.tar.xz) = 6c56e869feee0195e202fa181140e30789f62bf73248f615ffd546de6315e6df
+SIZE (guacamole-client/repository-1.2.0.tar.xz) = 66204420
+SHA256 (guacamole-client/apache-guacamole-client-1.2.0_GH0.tar.gz) = 2327368a32e61cf82032311be79ded4e5eefbc59ac9fb6e0a054b4f49168843e
+SIZE (guacamole-client/apache-guacamole-client-1.2.0_GH0.tar.gz) = 6116116
diff --git a/www/guacamole-client/pkg-plist b/www/guacamole-client/pkg-plist
index 962dfa63ab4a..71e64f4b006e 100644
--- a/www/guacamole-client/pkg-plist
+++ b/www/guacamole-client/pkg-plist
@@ -9,5 +9,6 @@
 %%DATADIR%%/guacamole-auth-ldap.tar.gz
 %%DATADIR%%/guacamole-auth-openid.tar.gz
 %%DATADIR%%/guacamole-auth-quickconnect.tar.gz
+%%DATADIR%%/guacamole-auth-saml.tar.gz
 %%DATADIR%%/guacamole-auth-totp.tar.gz
 %%DATADIR%%/guacamole.war