diff --git a/java/javamail/Makefile b/java/javamail/Makefile
index 39d424b0dc1a..0f995668d1ed 100644
--- a/java/javamail/Makefile
+++ b/java/javamail/Makefile
@@ -1,56 +1,68 @@
 PORTNAME=	javamail
 DISTVERSIONPREFIX=	${PORTNAME:tu}-
 DISTVERSION=	1_6_2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java mail
+MASTER_SITES=	https://github.com/jakartaee/jaf-api/releases/download/1.2.1/:jaf
+DISTFILES=	jakarta.activation.jar:jaf
+EXTRACT_ONLY=	javaee-javamail-JAVAMAIL-1_6_2_GH0.tar.gz
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Reference Implementation of JSR 919
 WWW=		https://javaee.github.io/javamail/
 
 LICENSE=	GPLv2 CDDL
 LICENSE_COMB=	dual
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-USES=		cpe java:ant,run
+USES=		cpe java:ant
 USE_GITHUB=	yes
 GH_ACCOUNT=	javaee
 CPE_VENDOR=	sun
-JAVA_VERSION=	8
 
 NO_ARCH=	yes
 
 PLIST_FILES=	%%JAVAJARDIR%%/mail.jar
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 ALL_TARGET=	all docs
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${JAVA_PORT_VERSION} != 8
+PLIST_FILES+=	%%JAVAJARDIR%%/jakarta.activation.jar
+MAKE_ARGS+=	-Dactivation.jar=${DISTDIR}/jakarta.activation.jar
+.endif
+
 do-install:
 	@${ECHO_MSG} -n ">> Install JAR files in ${JAVAJARDIR}..."
 	@${INSTALL_DATA} ${WRKSRC}/target/release/mail.jar ${STAGEDIR}${JAVAJARDIR}/
+.if ${JAVA_PORT_VERSION} != 8
+	@${INSTALL_DATA} ${DISTDIR}/jakarta.activation.jar ${STAGEDIR}${JAVAJARDIR}/
+.endif
 	@${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>
diff --git a/java/javamail/distinfo b/java/javamail/distinfo
index 109c3bbbe657..d901a636fc0e 100644
--- a/java/javamail/distinfo
+++ b/java/javamail/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1569853775
+TIMESTAMP = 1764885494
+SHA256 (jakarta.activation.jar) = d84d4ba8b55cdb7fdcbb885e6939386367433f56f5ab8cfdc302a7c3587fa92b
+SIZE (jakarta.activation.jar) = 65690
 SHA256 (javaee-javamail-JAVAMAIL-1_6_2_GH0.tar.gz) = 870e17293628437a03ae03404f51105c1ab8f682594cb18e005cb99e15d01d24
 SIZE (javaee-javamail-JAVAMAIL-1_6_2_GH0.tar.gz) = 1107140
diff --git a/java/javamail/files/patch-build.properties b/java/javamail/files/patch-build.properties
index 0398eb3d0fd8..b775415f8fad 100644
--- a/java/javamail/files/patch-build.properties
+++ b/java/javamail/files/patch-build.properties
@@ -1,22 +1,22 @@
 --- build.properties.orig	2019-09-30 14:35:51 UTC
 +++ build.properties
 @@ -98,7 +98,7 @@ jaf.url=http://docs.oracle.com/javase/6/docs/api
  ### Additonal Component Properties for standalone release ###
  release.dir=target/release
  release.specversion=1.5
 -release.version=1.5.1-SNAPSHOT
 +release.version=1.6.2
  release.mail.jar=${release.dir}/mail.jar
  release.mailapi.jar=${release.dir}/lib/mailapi.jar
  release.imap.jar=${release.dir}/lib/imap.jar
 @@ -125,8 +125,8 @@ glassfish.maven_repository_importer.version=1.1
  javac.debug=on
  javac.optimize=off
  javac.deprecation=off
 -javac.source=1.5
 -javac.target=1.5
-+javac.source=7
-+javac.target=7
++javac.source=8
++javac.target=8
  
  ### Use ant.verbose=-verbose for debugging ant targets
  ant.verbose=