diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 7253b5c9860f5..5b6656f83d596 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -1,15 +1,22 @@
 PORTNAME=	gc
-DISTVERSION=	8.2.4
+DISTVERSION=	8.3.0
 CATEGORIES=	devel
-MASTER_SITES=	http://www.hboehm.info/gc/gc_source/ \
-		https://github.com/ivmai/bdwgc/releases/download/v${PORTVERSION}/
+DISTNAME=	bdwgc
+EXTRACT_SUFX=	.tar.gz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	capablevms
+GH_PROJECT=	bdwgc
+GH_TAGNAME=	df6a3b7
+
 PKGNAMEPREFIX=	boehm-
 .ifdef GC_VARIANT
 PKGNAMESUFFIX=	-${GC_VARIANT}
 .endif
 
-MAINTAINER=	yasu@FreeBSD.org
-COMMENT=	Garbage collection and memory leak detection for C and C++
+MAINTAINER=	dejice.jacob@glasgow.ac.uk
+COMMENT=	Garbage collection and memory leak detection for C, with CHERI purecap support
 WWW=		https://www.hboehm.info/gc/
 
 LICENSE=	BDWGC
@@ -19,7 +26,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
 
-USES=		cpe libtool pathfix pkgconfig
+USES=		autoreconf
 CPE_VENDOR=	boehm-demers-weiser
 CPE_PRODUCT=	garbage_collector
 USE_LDCONFIG=	yes
@@ -34,8 +41,6 @@ MAKE_JOBS_UNSAFE=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
-WRKSRC=		${WRKDIR}/${DISTNAME:C/[a-z]$//}
-
 OPTIONS_DEFINE=	DEBUG
 
 .ifdef GC_VARIANT
@@ -56,7 +61,7 @@ PLIST_FILES=		${CORDLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.a,} \
 			${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.a,} \
 			${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \
 			${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1,} \
-			${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.5.2,} \
+			${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.5.1,} \
 			${GCTBALIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.a,} \
 			${GCTBALIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \
 			${GCTBALIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1,} \
@@ -86,11 +91,6 @@ PARALLEL_MARK_CONFIGURE_WITH=	--enable-parallel-mark
 
 .ifdef GC_VARIANT
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's,libcord\.la,libcord-${GC_VARIANT}.la,g ; \
-		s,libgc\.la,libgc-${GC_VARIANT}.la,g ; \
-		s,libgccpp\.la,libgccpp-${GC_VARIANT}.la,g ; \
-		s,libgctba\.la,libgctba-${GC_VARIANT}.la,g' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's,-lgc,-lgc-${GC_VARIANT},' ${WRKSRC}/bdw-gc.pc.in
 
@@ -103,16 +103,13 @@ post-install:
 		${STAGEDIR}${PREFIX}/include/gc
 . endif
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcord-${GC_VARIANT}.so.1.5.0
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgc-${GC_VARIANT}.so.1.5.2
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgc-${GC_VARIANT}.so.1.5.1
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgccpp-${GC_VARIANT}.so.1.5.0
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgctba-${GC_VARIANT}.so.1.5.0
 
 .else # ! GC_VARIANT
 post-patch:
-	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/gc.man
-	@${REINPLACE_CMD} \
-		-e "s|(datadir)/@PACKAGE@|(datadir)/doc/@PACKAGE@|" \
-		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/gc.man
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/devel/boehm-gc/Makefile.purecap b/devel/boehm-gc/Makefile.purecap
deleted file mode 100644
index 22006804a8f98..0000000000000
--- a/devel/boehm-gc/Makefile.purecap
+++ /dev/null
@@ -1 +0,0 @@
-BROKEN_purecap_failed=1
diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo
index 35632ff541a63..061ded0b8086b 100644
--- a/devel/boehm-gc/distinfo
+++ b/devel/boehm-gc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1685552073
-SHA256 (gc-8.2.4.tar.gz) = 3d0d3cdbe077403d3106bb40f0cbb563413d6efdbb2a7e1cd6886595dec48fc2
-SIZE (gc-8.2.4.tar.gz) = 1210929
+TIMESTAMP = 1709919906
+SHA256 (capablevms-bdwgc-8.3.0-df6a3b7_GH0.tar.gz) = 212dda624cf7fe06a1866aacb8d35c528817c06db6e25b8ff501997a1a427504
+SIZE (capablevms-bdwgc-8.3.0-df6a3b7_GH0.tar.gz) = 834896
diff --git a/devel/boehm-gc/files/patch-doc_gc.man b/devel/boehm-gc/files/patch-doc_gc.man
deleted file mode 100644
index 3903cbed02855..0000000000000
--- a/devel/boehm-gc/files/patch-doc_gc.man
+++ /dev/null
@@ -1,51 +0,0 @@
---- doc/gc.man.orig	2014-05-22 20:47:28 UTC
-+++ doc/gc.man
-@@ -88,6 +88,48 @@ This may temporarily write protect pages
- .LP
- Other facilities not discussed here include limited facilities to support incremental collection on machines without appropriate VM support, provisions for providing more explicit object layout information to the garbage collector, more direct support for ``weak'' pointers, support for ``abortable'' garbage collections during idle time, etc.
- .LP
-+.SH "PORT INFORMATION"
-+.LP
-+In this (FreeBSD package) installation,
-+.I gc.h
-+and
-+.I gc_cpp.h
-+will probably be found in
-+.I %%PREFIX%%/include,
-+and the library in
-+.I %%PREFIX%%/lib.
-+.LP
-+This library has been compiled as drop-in replacements
-+for malloc and free (which is to say, all malloc
-+calls will allocate garbage-collectable data).
-+There is no need to include "gc.h" in your C files unless you want
-+access to the debugging (and other) functions defined there,
-+or unless you want to explicitly use
-+.I GC_malloc_uncollectable
-+for some allocations.
-+Just link against them whenever you want either garbage
-+collection or leak detection.
-+.LP
-+The C++ header file, "gc_cpp.h",
-+.I is
-+necessary for C++ programs, to obtain the appropriate
-+definitions of the
-+.I new
-+and
-+.I delete
-+operators.
-+The comments in both of these header files presently
-+provide far better documentation
-+for the package than this man page;
-+look there for more information.
-+.LP
-+This library is compiled without (explicit) support
-+for the experimental
-+.I gc
-+extension of
-+.I g++.
-+This may or may not make a difference.
-+.LP
- .SH "SEE ALSO"
- The README and gc.h files in the distribution.  More detailed definitions of the functions exported by the collector are given there.  (The above list is not complete.)
- .LP
diff --git a/devel/boehm-gc/pkg-plist b/devel/boehm-gc/pkg-plist
index c67deda40255e..f3cf7d9d12f0a 100644
--- a/devel/boehm-gc/pkg-plist
+++ b/devel/boehm-gc/pkg-plist
@@ -24,7 +24,7 @@ lib/libcord.so.1.5.0
 lib/libgc.a
 lib/libgc.so
 lib/libgc.so.1
-lib/libgc.so.1.5.2
+lib/libgc.so.1.5.1
 lib/libgccpp.a
 lib/libgccpp.so
 lib/libgccpp.so.1