diff --git a/java/bouncycastle15/Makefile b/java/bouncycastle15/Makefile
index 959de8427a0b..28eaac7e39af 100644
--- a/java/bouncycastle15/Makefile
+++ b/java/bouncycastle15/Makefile
@@ -1,81 +1,84 @@
 # Created by: Eugene Grosbein <ports@grosbein.net>
 
 PORTNAME=	bouncycastle
 PORTVERSION=	1.69
 CATEGORIES=	java security
 MASTER_SITES=	http://www.bouncycastle.org/download/ \
 		http://polydistortion.net/bc/download/
 PKGNAMESUFFIX=	15
 DISTNAME=	crypto-${DVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cleanroom build of Java Cryptography Extensions
 
-LICENSE=	MIT
+# APACHE20 is used by pg/src/main/java/org/bouncycastle/apache/bzip2/*.
+LICENSE=	APACHE20 MIT
+LICENSE_COMB=	multi
+LICENSE_FILE_MIT=	${WRKSRC}/LICENSE.html
 
 BUILD_DEPENDS=	${JAVALIBDIR}/junit.jar:java/junit \
 		${JAVALIBDIR}/mail.jar:java/javamail
 RUN_DEPENDS=	${JAVALIBDIR}/mail.jar:java/javamail
 
 USES=		cpe
 CPE_VENDOR=	${PORTNAME}
 CPE_PRODUCT=	legion-of-the-bouncy-castle-java-crytography-api
 USE_ANT=	yes
 USE_JAVA=	yes
 
 MAKE_ARGS=	-f \
 		ant/jdk${JDKNVERSION}+.xml
 MAKE_ENV=	ANT_INCLUDE_SHARED_JARS=YES
 ALL_TARGET=	build-provider build zip-src
 
 CONFLICTS_INSTALL=	bouncycastle-1.4*
 
 NO_ARCH=	yes
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=		DOCS ZIPSRC
 OPTIONS_DEFAULT=	ZIPSRC
 OPTIONS_SUB=		yes
 
 ZIPSRC_DESC=	Install bundled ZIP source files
 
 DVERSION=	${PORTVERSION:S/.//}
 JDKMVERSION=	1.5
 JDKNVERSION=	15
 JARS_SRC=	bcmail bcpkix bcprov bcpg
 JARS_DOCS=	${JARS_SRC} bctest bctls
 JARS=		${JARS_DOCS} bcprov-ext
 
 .include <bsd.port.options.mk>
 
 # PR 220612: remove fork="true" in javac and fork="yes" in junit tasks
 .if ${ARCH} == armv6 || ${ARCH} == armv7
 EXTRA_PATCHES+=	${FILESDIR}/armv6-patch-bc+-build.xml
 .endif
 
 do-install:
 .for jar in ${JARS}
 	${INSTALL_DATA} ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/jars/${jar}-jdk${JDKNVERSION}on-${DVERSION}.jar \
 	      ${STAGEDIR}${JAVAJARDIR}/${jar}.jar
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/jars/bcprov-jdk${JDKNVERSION}on-${DVERSION}.jar \
 		${STAGEDIR}${JAVAJARDIR}/bcprov.jar
 .if ${PORT_OPTIONS:MZIPSRC}
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for jar in ${JARS_SRC}
 	${INSTALL_DATA} ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/${jar}-jdk${JDKNVERSION}on-${DVERSION}/src.zip \
 	      ${STAGEDIR}${DATADIR}/${jar}-src.zip
 .endfor
 .endif
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.html ${STAGEDIR}${DOCSDIR}
 .for jar in ${JARS_DOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/${jar}
 	@cd ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/${jar}-jdk${JDKNVERSION}on-${DVERSION}/docs/ && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${jar}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/java/bouncycastle15/pkg-descr b/java/bouncycastle15/pkg-descr
index b330c53b83fc..7a9376f8aea7 100644
--- a/java/bouncycastle15/pkg-descr
+++ b/java/bouncycastle15/pkg-descr
@@ -1,24 +1,9 @@
-The Bouncy Castle Crypto APIs consist of the following:
+The Bouncy Castle Crypto package is a Java implementation of cryptographic
+algorithms. It was developed by the Legion of the Bouncy Castle, a registered
+Australian Charity.
 
-. A lightweight cryptography API in Java.
-. A provider for the JCE and JCA.
-. A clean room implementation of the JCE 1.2.1.
-. A library for reading and writing encoded ASN.1 objects.
-. Lightweight APIs for TLS (RFC 2246, RFC 4346) and DTLS (RFC 4347).
-. Generators for Version 1 and Version 3 X.509 certificates, Version 2 CRLs,
-  and PKCS12 files.
-. Generators for Version 2 X.509 attribute certificates.
-. Generators/Processors for S/MIME and CMS (PKCS7/RFC 3852).
-. Generators/Processors for OCSP (RFC 2560).
-. Generators/Processors for TSP (RFC 3161 & RFC 5544).
-. Generators/Processors for CMP and CRMF (RFC 4210 & RFC 4211).
-. Generators/Processors for OpenPGP (RFC 2440).
-. Generators/Processors for Extended Access Control (EAC).
-. Generators/Processors for Data Validation and Certification Server (DVCS) -
-  RFC 3029.
-. Generators/Processors for DNS-based Authentication of Named Entities (DANE).
-. A signed jar version suitable for JDK 1.4-1.8 and the Sun JCE.
+The package is organised so that it contains a light-weight API suitable for
+use in any environment (including the J2ME) with the additional infrastructure
+to conform the algorithms to the JCE framework.
 
-It's distributed under a modified X license.
-
-WWW: http://www.bouncycastle.org/
+WWW: https://www.bouncycastle.org/