diff --git a/java/bouncycastle/Makefile b/java/bouncycastle/Makefile
index 89d908d43fca..2d5ce91301c3 100644
--- a/java/bouncycastle/Makefile
+++ b/java/bouncycastle/Makefile
@@ -19,10 +19,12 @@ BUILD_DEPENDS=	${JAVALIBDIR}/activation.jar:${PORTSDIR}/java/jaf \
 RUN_DEPENDS=	${JAVALIBDIR}/activation.jar:${PORTSDIR}/java/jaf \
 		${JAVALIBDIR}/mail.jar:${PORTSDIR}/java/javamail
 
+OPTIONS_DEFINE=	DOCS
+
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
-JDKMVERSION=	${JAVA_PORT_VERSION:C/^([0-9]\.[0-9])(.*)$/\1/}
-JDKNVERSION=	${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1\2/}
+JDKMVERSION=	1.6 # ${JAVA_PORT_VERSION:C/^([0-9]\.[0-9])(.*)$/\1/}
+JDKNVERSION=	16 # ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1\2/}
 USE_ANT=	yes
 MAKE_ENV=	ANT_INCLUDE_SHARED_JARS=YES
 MAKE_ARGS=	-f jdk${JDKNVERSION}.xml
@@ -35,29 +37,28 @@ PORTDOCS=	*
 
 PORTSCOUT=	skipv:146
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} s/BERConstructedOctetString/DEROctetString/ \
 		${WRKSRC}/src/org/bouncycastle/cms/CMS*DataGenerator.java
+	@${REINPLACE_CMD} 's/<javac/<javac encoding="UTF-8"/;s/<javadoc/<javadoc encoding="UTF-8"/' \
+		${WRKSRC}/bc-build.xml ${WRKSRC}/common.xml
 
 do-install:
-	@${MKDIR} ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for jar in ${JARS}
 	${INSTALL_DATA} ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/jars/${jar}-jdk${JDKNVERSION}-${DISTVERSION}.jar \
-	      ${JAVAJARDIR}/${jar}.jar
+	      ${STAGEDIR}${JAVAJARDIR}/${jar}.jar
 	${INSTALL_DATA} ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/${jar}-jdk${JDKNVERSION}-${DISTVERSION}/src.zip \
-	      ${DATADIR}/${jar}-src.zip
+	      ${STAGEDIR}${DATADIR}/${jar}-src.zip
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/jars/bcprov-jdk${JDKNVERSION}-${DISTVERSION}.jar \
-		${JAVAJARDIR}/bcprov.jar
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.html ${DOCSDIR}
+		${STAGEDIR}${JAVAJARDIR}/bcprov.jar
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.html ${STAGEDIR}${DOCSDIR}
 .for jar in ${JARS}
-	@${MKDIR} ${DOCSDIR}/${jar}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/${jar}
 	@cd ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/${jar}-jdk${JDKNVERSION}-${DISTVERSION}/docs/ && \
-		${COPYTREE_SHARE} . ${DOCSDIR}/${jar}
+		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${jar}
 .endfor
-.endif
 
 .include <bsd.port.mk>