diff --git a/java/bouncycastle/Makefile b/java/bouncycastle/Makefile
index 4038cabb9f30..67124a3f3454 100644
--- a/java/bouncycastle/Makefile
+++ b/java/bouncycastle/Makefile
@@ -1,91 +1,90 @@
 PORTNAME=	bouncycastle
-DISTVERSION=	1.71
-PORTREVISION=	5
+DISTVERSION=	1.83
 CATEGORIES=	java security
-MASTER_SITES=	http://www.bouncycastle.org/download/ \
-		http://polydistortion.net/bc/download/
-DISTNAME=	crypto-${DVERSION}
+MASTER_SITES=	https://github.com/bcgit/bc-java/archive/refs/tags/
+DISTNAME=	r${DVERSION1}rv${DVERSION2}
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cleanroom build of Java Cryptography Extensions
 WWW=		https://www.bouncycastle.org/
 
 # 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 java:ant,run
 CPE_VENDOR=	${PORTNAME}
 CPE_PRODUCT=	bc-java
 
 MAKE_ARGS=	-f \
 		ant/jdk${JDKNVERSION}+.xml
 MAKE_ENV=	ANT_INCLUDE_SHARED_JARS=YES
 ALL_TARGET=	build-provider build
 
-CONFLICTS_INSTALL=	bouncycastle-1.4*
-
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		DOCS ZIPSRC
 OPTIONS_DEFAULT=	ZIPSRC
 OPTIONS_SUB=		yes
 
 ZIPSRC_DESC=		Install bundled ZIP source files
 ZIPSRC_ALL_TARGET=	zip-src
 
+DVERSION1=	${PORTVERSION:R}
+DVERSION2=	${PORTVERSION:E}
+WRKSRC=		${WRKDIR}/bc-java-${DISTNAME}
 ARTIFACTSDIR=	${WRKSRC}/build/artifacts/jdk${JDKMVERSION}
-DVERSION=	${PORTVERSION:S/.//}
 JDKMVERSION=	1.8
 JDKNVERSION=	18
 # matches target.prefix property in WRKSRC/ant/jdk18+.xml
-JARSUFFIX=	-jdk${JDKNVERSION}on-${DVERSION}.jar
+JARSUFFIX=	-jdk${JDKNVERSION}on-${PORTVERSION}.jar
 
 .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 src in $$(${FIND} ${ARTIFACTSDIR}/jars -name "*${JARSUFFIX}"); do \
 		dst="$${src##*/}"; \
 		dst="$${dst%%-jdk*}.jar"; \
-		${INSTALL_DATA} "$$src" "${STAGEDIR}/${JAVAJARDIR}/$${dst}"; \
+		${INSTALL_DATA} "$$src" "${STAGEDIR}${JAVAJARDIR}/$${dst}"; \
 	done
 # Install the bundlded version of bcprov.jar because we need a signed JAR.
 # See bfca5d2c6e01d757f1f37c141c22645c2835104b for details.
-	${INSTALL_DATA} ${WRKSRC}/jars/bcprov${JARSUFFIX} \
+	${INSTALL_DATA} ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/jars/bcprov${JARSUFFIX} \
 		${STAGEDIR}${JAVAJARDIR}/bcprov.jar
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.html ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/docs
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} docs "${STAGEDIR}${DOCSDIR}")
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/tls/docs
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} tls/docs "${STAGEDIR}${DOCSDIR}")
 # Skip the lcrypto documentation since that JAR is not installed.
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	for src in $$(${FIND} ${ARTIFACTSDIR} -type d -name "docs"); do \
 		dst="$${src%%-jdk*}"; \
 		dst="$${dst##*/}"; \
 		case $${dst} in lcrypto) continue;; esac; \
 		(cd $${src} && ${COPYTREE_SHARE} . "${STAGEDIR}${DOCSDIR}/$${dst}"); \
 	done
 
 do-install-ZIPSRC-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	for src in $$(${FIND} ${ARTIFACTSDIR} -name "src.zip"); do \
 		dst="$${src%%-jdk*}"; \
 		dst="$${dst##*/}-src.zip"; \
 		${INSTALL_DATA} "$$src" "${STAGEDIR}/${DATADIR}/$${dst}"; \
 	done
 
 .include <bsd.port.mk>
diff --git a/java/bouncycastle/distinfo b/java/bouncycastle/distinfo
index 7924a434da2c..d6ca0b4900fa 100644
--- a/java/bouncycastle/distinfo
+++ b/java/bouncycastle/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1656156462
-SHA256 (crypto-171.tar.gz) = 4b2b2be9a416c2fa4b26c64b69fe3ae7af075874b3df029cd82fdb4c49d4449e
-SIZE (crypto-171.tar.gz) = 239271294
+TIMESTAMP = 1772290539
+SHA256 (bouncycastle/r1rv83.tar.gz) = b69c7cd86f8ae6e8343f586805430af95508ea925369632f9f7c35236d365b6c
+SIZE (bouncycastle/r1rv83.tar.gz) = 47658743
diff --git a/java/bouncycastle/files/patch-ant_bc+-build.xml b/java/bouncycastle/files/patch-ant_bc+-build.xml
deleted file mode 100644
index 435dbab2a372..000000000000
--- a/java/bouncycastle/files/patch-ant_bc+-build.xml
+++ /dev/null
@@ -1,26 +0,0 @@
---- ant/bc+-build.xml.orig	2025-12-04 21:43:00 UTC
-+++ ant/bc+-build.xml
-@@ -118,6 +118,7 @@
-                 <mkdir dir="${artifacts.dir}/@{target}" />
- 
-                 <javac source="${bc.javac.source}" target="${bc.javac.target}"
-+                    encoding="UTF-8"
-                     srcdir="${artifacts.dir}/@{target}/src"
-                     destdir="${build.dir}/@{target}/classes"
-                     memoryMaximumSize="512m"
-@@ -155,6 +156,7 @@
-                 <mkdir dir="${artifacts.dir}/@{target}" />
- 
-                 <javac source="${bc.javac.source}" target="${bc.javac.target}"
-+                    encoding="UTF-8"
-                     srcdir="${artifacts.dir}/@{target}/src"
-                     destdir="${build.dir}/@{target}/classes"
-                     memoryMaximumSize="512m"
-@@ -302,6 +304,7 @@
-         </copy>
- 
-         <javac source="${bc.javac.source}" target="${bc.javac.target}"
-+            encoding="UTF-8"
-             srcdir="${lcrypto.target.src.dir}"
-             destdir="${lcrypto.target.classes.dir}"
- 	    memoryMaximumSize="512m"
diff --git a/java/bouncycastle/pkg-plist b/java/bouncycastle/pkg-plist
index dfc1c81222a0..e4bf1cac7fe7 100644
--- a/java/bouncycastle/pkg-plist
+++ b/java/bouncycastle/pkg-plist
@@ -1,45 +1,48 @@
+%%ZIPSRC%%%%DATADIR%%/bcjmail-src.zip
 %%ZIPSRC%%%%DATADIR%%/bcmail-src.zip
 %%ZIPSRC%%%%DATADIR%%/bcpg-src.zip
 %%ZIPSRC%%%%DATADIR%%/bcpkix-src.zip
 %%ZIPSRC%%%%DATADIR%%/bcprov-src.zip
+%%ZIPSRC%%%%DATADIR%%/bctls-src.zip
+%%ZIPSRC%%%%DATADIR%%/bcutil-src.zip
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS.html
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.html
 %%PORTDOCS%%%%DOCSDIR%%/bcjmail/index.html
 %%PORTDOCS%%%%DOCSDIR%%/bcjmail/releasenotes.html
 %%PORTDOCS%%%%DOCSDIR%%/bcjmail/specifications.html
 %%PORTDOCS%%%%DOCSDIR%%/bcmail/index.html
 %%PORTDOCS%%%%DOCSDIR%%/bcmail/releasenotes.html
 %%PORTDOCS%%%%DOCSDIR%%/bcmail/specifications.html
 %%PORTDOCS%%%%DOCSDIR%%/bcpg/index.html
 %%PORTDOCS%%%%DOCSDIR%%/bcpg/releasenotes.html
 %%PORTDOCS%%%%DOCSDIR%%/bcpg/specifications.html
 %%PORTDOCS%%%%DOCSDIR%%/bcpkix/index.html
 %%PORTDOCS%%%%DOCSDIR%%/bcpkix/releasenotes.html
 %%PORTDOCS%%%%DOCSDIR%%/bcpkix/specifications.html
 %%PORTDOCS%%%%DOCSDIR%%/bcprov/index.html
 %%PORTDOCS%%%%DOCSDIR%%/bcprov/releasenotes.html
 %%PORTDOCS%%%%DOCSDIR%%/bcprov/specifications.html
 %%PORTDOCS%%%%DOCSDIR%%/bctest/index.html
 %%PORTDOCS%%%%DOCSDIR%%/bctest/releasenotes.html
 %%PORTDOCS%%%%DOCSDIR%%/bctest/specifications.html
 %%PORTDOCS%%%%DOCSDIR%%/bctls/index.html
 %%PORTDOCS%%%%DOCSDIR%%/bctls/releasenotes.html
 %%PORTDOCS%%%%DOCSDIR%%/bctls/specifications.html
 %%PORTDOCS%%%%DOCSDIR%%/bcutil/index.html
 %%PORTDOCS%%%%DOCSDIR%%/bcutil/releasenotes.html
 %%PORTDOCS%%%%DOCSDIR%%/bcutil/specifications.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/index.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/releasenotes.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/specifications.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/tls/docs/GnuTLSSetup.html
 %%PORTDOCS%%%%DOCSDIR%%/tls/docs/OpenSSLSetup.html
 %%JAVAJARDIR%%/bcjmail.jar
 %%JAVAJARDIR%%/bcmail.jar
 %%JAVAJARDIR%%/bcpg.jar
 %%JAVAJARDIR%%/bcpkix.jar
 %%JAVAJARDIR%%/bcprov-ext.jar
 %%JAVAJARDIR%%/bcprov.jar
 %%JAVAJARDIR%%/bctest.jar
 %%JAVAJARDIR%%/bctls.jar
 %%JAVAJARDIR%%/bcutil.jar