Index: head/www/guacamole-client/Makefile
===================================================================
--- head/www/guacamole-client/Makefile
+++ head/www/guacamole-client/Makefile
@@ -2,25 +2,25 @@
 # $FreeBSD$
 
 PORTNAME=	guacamole-client
-PORTVERSION=	0.9.9
+PORTVERSION=	0.9.10
+DISTVERSIONSUFFIX=	-incubating
 CATEGORIES=	www java
 MASTER_SITES+=	https://sourceforge.net/projects/distfiles/files/${PORTNAME}/:repo \
 		http://sourceforge.net/projects/distfiles/files/${PORTNAME}/:repo
-DISTNAME=	${PORTVERSION}
-DISTFILES=	${PORTVERSION}_GH${EXTRACT_SUFX} \
-		repository-${PORTVERSION}${EXTRACT_SUFX}:repo
+DISTFILES=	repository-${PORTVERSION}${EXTRACT_SUFX}:repo
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ultima1252@gmail.com
 COMMENT=	HTML5 Clientless Remote Desktop
 
-LICENSE=	MIT
+LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/share/java/maven33/bin/mvn:devel/maven33
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	glyptodon
+GH_ACCOUNT=	apache
+GH_PROJECT=	incubator-guacamole-client
 
 MVN=		mvn
 MVN_ARGS=	package -Duser.home=${WRKDIR}
@@ -49,13 +49,13 @@
 		@${MKDIR} ${STAGEDIR}${GUACAMOLE_DATA}
 		@${MKDIR} ${STAGEDIR}${GUACAMOLE_CONF}
 
-		@${CP} ${WRKSRC}/guacamole/target/guacamole-${PORTVERSION}.war \
+		@${CP} ${WRKSRC}/guacamole/target/guacamole-${DISTVERSIONFULL}.war \
 			${STAGEDIR}${GUACAMOLE_DATA}/guacamole.war
-		@${CP} ${WRKSRC}/extensions/guacamole-auth-jdbc/target/guacamole-auth-jdbc-${PORTVERSION}.tar.gz \
+		@${CP} ${WRKSRC}/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/target/guacamole-auth-jdbc-${DISTVERSIONFULL}.tar.gz \
 			${STAGEDIR}/${GUACAMOLE_DATA}/guacamole-auth-jdbc.tar.gz
-		@${CP} ${WRKSRC}/extensions/guacamole-auth-ldap/target/guacamole-auth-ldap-${PORTVERSION}.tar.gz \
+		@${CP} ${WRKSRC}/extensions/guacamole-auth-ldap/target/guacamole-auth-ldap-${DISTVERSIONFULL}.tar.gz \
 			 ${STAGEDIR}/${GUACAMOLE_DATA}/guacamole-auth-ldap.tar.gz
-		@${CP} ${WRKSRC}/extensions/guacamole-auth-noauth/target/guacamole-auth-noauth-${PORTVERSION}.tar.gz \
+		@${CP} ${WRKSRC}/extensions/guacamole-auth-noauth/target/guacamole-auth-noauth-${DISTVERSIONFULL}.tar.gz \
 			 ${STAGEDIR}/${GUACAMOLE_DATA}/guacamole-auth-noauth.tar.gz
 
 .if ${PORT_OPTIONS:MMK_LINK}
Index: head/www/guacamole-client/distinfo
===================================================================
--- head/www/guacamole-client/distinfo
+++ head/www/guacamole-client/distinfo
@@ -1,4 +1,5 @@
-SHA256 (guacamole-client/0.9.9_GH.tar.gz) = d6a1f824115c2dc87c9d611b4a6cbe2a489604a512227af5c79a832c2690783f
-SIZE (guacamole-client/0.9.9_GH.tar.gz) = 1698262
-SHA256 (guacamole-client/repository-0.9.9.tar.gz) = 79bc3064fac3add03842d96f21d3eb24677dffcea19f6a72cdeb200734ad71f6
-SIZE (guacamole-client/repository-0.9.9.tar.gz) = 42806341
+TIMESTAMP = 1485061789
+SHA256 (guacamole-client/repository-0.9.10.tar.gz) = 4c30e44d0e0edef514fb902fab60d18d790f41faf6a33b484e89ed3b1454df12
+SIZE (guacamole-client/repository-0.9.10.tar.gz) = 45766702
+SHA256 (guacamole-client/apache-incubator-guacamole-client-0.9.10-incubating_GH0.tar.gz) = c48d1b89d0b32b1236e8b6557ea3c9bd8c0afc5a8ab785d33b488b53b617a1b7
+SIZE (guacamole-client/apache-incubator-guacamole-client-0.9.10-incubating_GH0.tar.gz) = 1625433
Index: head/www/guacamole-client/pkg-descr
===================================================================
--- head/www/guacamole-client/pkg-descr
+++ head/www/guacamole-client/pkg-descr
@@ -9,4 +9,4 @@
 first. If all projects are built using guacamole-client, Maven will
 take care of the proper build order.
 
-WWW: https://github.com/glyptodon/guacamole-client
+WWW: http://guacamole.incubator.apache.org