Index: head/java/javamail/Makefile
===================================================================
--- head/java/javamail/Makefile	(revision 447627)
+++ head/java/javamail/Makefile	(revision 447628)
@@ -1,58 +1,59 @@
 # Created by: Jose Marques
 # $FreeBSD$
 
 PORTNAME=	javamail
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.6
 CATEGORIES=	java mail
-MASTER_SITES=	https://java.net/projects/javamail/downloads/download/source/
-DISTNAME=	javaxmail-${PORTVERSION}-src
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Reference Implementation of JSR 919
 
 LICENSE=	GPLv2 CDDL
 LICENSE_COMB=	dual
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-USES=		cpe zip
+USE_GITHUB=	yes
+GH_ACCOUNT=	javaee
+GH_TAGNAME=	${PORTNAME:tu}-${PORTVERSION:S/./_/g}
+
+USES=		cpe
 CPE_VENDOR=	sun
 USE_JAVA=	YES
 JAVA_VERSION=	1.6+
 USE_ANT=	YES
-
-WRKSRC=		${WRKDIR}
+NO_ARCH=	yes
 
 PLIST_FILES=	%%JAVAJARDIR%%/mail.jar
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 ALL_TARGET=	all docs
 .endif
 
 do-install:
 	@${ECHO_MSG} -n ">> Install JAR files in ${JAVAJARDIR}..."
 	@${INSTALL_DATA} ${WRKSRC}/target/release/mail.jar ${STAGEDIR}${JAVAJARDIR}/
 	@${ECHO_MSG} " [ DONE ]"
 .if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC}/target/release && ${FIND} *.txt \
 	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1
 	@cd ${WRKSRC}/target/release/docs && ${FIND} *.txt javadocs \
 	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1
 	@${ECHO_MSG} " [ DONE ]"
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${ECHO_MSG} -n ">> Installing samples in ${EXAMPLESDIR}..."
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@cd ${WRKSRC}/demo && ${FIND} src \
 	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${EXAMPLESDIR} > /dev/null 2>&1
 	@${ECHO_MSG} " [ DONE ]"
 .endif
 
 .include <bsd.port.mk>
Index: head/java/javamail/distinfo
===================================================================
--- head/java/javamail/distinfo	(revision 447627)
+++ head/java/javamail/distinfo	(revision 447628)
@@ -1,2 +1,3 @@
-SHA256 (javaxmail-1.5.1-src.zip) = 86d443f6954db70576cd5f8e1e30e70412b6825391b959fd2359236fb12b2ca3
-SIZE (javaxmail-1.5.1-src.zip) = 1510490
+TIMESTAMP = 1502292268
+SHA256 (javaee-javamail-1.5.6-JAVAMAIL-1_5_6_GH0.tar.gz) = e065282db903d509c0d7e8717bdf7ecaf1353267223616aaf38055ebb4369533
+SIZE (javaee-javamail-1.5.6-JAVAMAIL-1_5_6_GH0.tar.gz) = 1041816
Index: head/java/javamail/pkg-descr
===================================================================
--- head/java/javamail/pkg-descr	(revision 447627)
+++ head/java/javamail/pkg-descr	(revision 447628)
@@ -1,6 +1,6 @@
 The JavaMail API provides a platform-independent and protocol-independent
 framework to build mail and messaging applications. The JavaMail API is
 available as an optional package for use with Java SE platform and is
 also included in the Java EE platform.
 
-WWW: http://www.oracle.com/technetwork/java/javamail/
+WWW: https://javaee.github.io/javamail/