diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 4d801bdff583..1c1c0b21b31e 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -1,107 +1,106 @@
 # Created by: Mike McGaughey <mmcg@cs.monash.edu.au>
 
 PORTNAME=	gc
-PORTVERSION=	8.0.4
-PORTREVISION=	1
+PORTVERSION=	8.0.6
 CATEGORIES=	devel
 MASTER_SITES=	http://www.hboehm.info/gc/gc_source/ \
 		https://github.com/ivmai/bdwgc/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	boehm-
 .ifdef GC_VARIANT
 PKGNAMESUFFIX=	-${GC_VARIANT}
 .endif
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Garbage collection and memory leak detection for C and C++
 
 LICENSE=	BDWGC
 LICENSE_NAME=	Boehm-Demers-Weiser Garbage Collector License
 LICENSE_TEXT=	License can be found at http://www.hboehm.info/gc/license.txt
 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
 USE_LDCONFIG=	yes
 
 CPE_VENDOR=	boehm-demers-weiser
 CPE_PRODUCT=	garbage_collector
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 # NOTE: do not --disable-static, static is useful for e.g. lang/crystal
 CONFIGURE_ARGS=	--enable-cplusplus --enable-static
 MAKE_JOBS_UNSAFE=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME:C/[a-z]$//}
 
 OPTIONS_DEFINE=	DEBUG
 
 .ifdef GC_VARIANT
 INSTALL_TARGET=	install-exec install-pkgconfigDATA
 CORDLIBS=	cord
 GCLIBS=		gc
 GCCPPLIBS=	gccpp
 PLIST=		${NONEXISTENT}
 PLIST_FILES=	${CORDLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.a,} \
 		${CORDLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \
 		${CORDLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1,} \
 		${CORDLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.4.0,} \
 		${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.4.3,} \
+		${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.4.4,} \
 		${GCCPPLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.a,} \
 		${GCCPPLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \
 		${GCCPPLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1,} \
-		${GCCPPLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.4.0,} \
+		${GCCPPLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.4.1,} \
 		libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc
 RUN_DEPENDS+=	${LOCALBASE}/include/gc/gc.h:devel/boehm-gc
 . if ${GC_VARIANT} == "redirect"
 CONFIGURE_ARGS+=	--disable-threads --enable-redirect-malloc
 . endif
 . if ${GC_VARIANT} == "threaded"
 CONFIGURE_ARGS+=	--enable-threads=posix --disable-redirect-malloc
 OPTIONS_DEFINE+=	PARALLEL_MARK
 PARALLEL_MARK_DESC=	Parallel-thread marking (faster for SMP)
 USES+=		compiler:c11
 . endif
 .else
 CONFIGURE_ARGS+=	--disable-threads --disable-redirect-malloc
 OPTIONS_DEFINE+=	DOCS
 PORTDOCS=	*
 .endif
 
 DEBUG_CONFIGURE_WITH=	--enable-gc-debug
 
 .if defined(GC_VARIANT) && ${GC_VARIANT} == "threaded"
 PARALLEL_MARK_CONFIGURE_WITH=	--enable-parallel-mark
 .endif
 
 .ifdef GC_VARIANT
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's,libgc\.la,libgc-${GC_VARIANT}.la,g ; \
 		s,libgccpp\.la,libgccpp-${GC_VARIANT}.la,g ; \
 		s,libcord\.la,libcord-${GC_VARIANT}.la,g' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's,-lgc,-lgc-${GC_VARIANT},' ${WRKSRC}/bdw-gc.pc.in
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/bdw-gc.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc
 
 .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
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo
index 6b2dde39e8af..2aa230148df9 100644
--- a/devel/boehm-gc/distinfo
+++ b/devel/boehm-gc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551518559
-SHA256 (gc-8.0.4.tar.gz) = 436a0ddc67b1ac0b0405b61a9675bca9e075c8156f4debd1d06f3a56c7cd289d
-SIZE (gc-8.0.4.tar.gz) = 1160528
+TIMESTAMP = 1632865018
+SHA256 (gc-8.0.6.tar.gz) = 3b4914abc9fa76593596773e4da671d7ed4d5390e3d46fbf2e5f155e121bea11
+SIZE (gc-8.0.6.tar.gz) = 1168660
diff --git a/devel/boehm-gc/pkg-plist b/devel/boehm-gc/pkg-plist
index 3a941d1a84be..614442794972 100644
--- a/devel/boehm-gc/pkg-plist
+++ b/devel/boehm-gc/pkg-plist
@@ -1,34 +1,34 @@
 include/gc.h
 include/gc/cord.h
 include/gc/cord_pos.h
 include/gc/ec.h
 include/gc/gc.h
 include/gc/gc_allocator.h
 include/gc/gc_backptr.h
 include/gc/gc_config_macros.h
 include/gc/gc_cpp.h
 include/gc/gc_disclaim.h
 include/gc/gc_gcj.h
 include/gc/gc_inline.h
 include/gc/gc_mark.h
 include/gc/gc_pthread_redirects.h
 include/gc/gc_tiny_fl.h
 include/gc/gc_typed.h
 include/gc/gc_version.h
 include/gc/javaxfc.h
 include/gc/leak_detector.h
 include/gc_cpp.h
 lib/libcord.a
 lib/libcord.so
 lib/libcord.so.1
 lib/libcord.so.1.4.0
 lib/libgc.a
 lib/libgc.so
 lib/libgc.so.1
-lib/libgc.so.1.4.3
+lib/libgc.so.1.4.4
 lib/libgccpp.a
 lib/libgccpp.so
 lib/libgccpp.so.1
-lib/libgccpp.so.1.4.0
+lib/libgccpp.so.1.4.1
 libdata/pkgconfig/bdw-gc.pc
 man/man3/gc.3.gz