diff -Nur java/javamail/Makefile /build/poudriere/ports/default/java/javamail/Makefile
--- java/javamail/Makefile	2015-05-11 08:09:15.000000000 +0200
+++ /build/poudriere/ports/default/java/javamail/Makefile	2017-07-10 09:32:20.886975000 +0200
@@ -2,10 +2,10 @@
 # $FreeBSD: head/java/javamail/Makefile 386052 2015-05-11 06:09:15Z amdmi3 $
 
 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
+MASTER_SITES=	https://github.com/javaee/javamail/archive/
+DISTNAME=	JAVAMAIL-1_5_6
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Reference Implementation of JSR 919
@@ -21,7 +21,7 @@
 JAVA_VERSION=	1.6+
 USE_ANT=	YES
 
-WRKSRC=		${WRKDIR}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTNAME}
 
 PLIST_FILES=	%%JAVAJARDIR%%/mail.jar
 
diff -Nur java/javamail/distinfo /build/poudriere/ports/default/java/javamail/distinfo
--- java/javamail/distinfo	2014-01-22 16:30:13.000000000 +0100
+++ /build/poudriere/ports/default/java/javamail/distinfo	2017-07-10 08:53:18.193926000 +0200
@@ -1,2 +1,3 @@
-SHA256 (javaxmail-1.5.1-src.zip) = 86d443f6954db70576cd5f8e1e30e70412b6825391b959fd2359236fb12b2ca3
-SIZE (javaxmail-1.5.1-src.zip) = 1510490
+TIMESTAMP = 1499669598
+SHA256 (JAVAMAIL-1_5_6.zip) = 6e8f08566abcf65dfd2683bb3fb171f3786e7fe7e36b0c6b995b5dcc304d3e2e
+SIZE (JAVAMAIL-1_5_6.zip) = 1825639