diff --git a/lang/gcc/11/Makefile b/lang/gcc/11/Makefile
index 607b2dfa5e5..0ae80230c6b 100644
--- a/lang/gcc/11/Makefile
+++ b/lang/gcc/11/Makefile
@@ -17,7 +17,9 @@ FULL_VERSION = $V
 FULL_PKGVERSION = $V
 REVISION = 21
 
-ADASTRAP-amd64 = adastrap-amd64-$V-5.tar.xz
+# aarch64 bootstrap contains only gdc
+ADASTRAP-aarch64 = adastrap-aarch64-$V-0.tar.xz
+ADASTRAP-amd64 = adastrap-amd64-$V-6.tar.xz
 ADASTRAP-i386 = adastrap-i386-$V-4.tar.xz
 ADASTRAP-mips64 = adastrap-mips64-8.4.0-5.tar.xz
 ADASTRAP-powerpc = adastrap-powerpc-$V-4.tar.xz
@@ -272,14 +274,29 @@ post-install:
 
 ADA_PACKAGE = ${PACKAGE_REPOSITORY}/${MACHINE_ARCH}/all/${FULLPKGNAME-ada}.tgz
 GCC_PACKAGE = ${PACKAGE_REPOSITORY}/${MACHINE_ARCH}/all/${FULLPKGNAME-main}.tgz
+GDC_PACKAGE = ${PACKAGE_REPOSITORY}/${MACHINE_ARCH}/all/${FULLPKGNAME-dlang}.tgz
 GXX_PACKAGE = ${PACKAGE_REPOSITORY}/${MACHINE_ARCH}/all/${FULLPKGNAME-c++}.tgz
 
 .PHONY: bootstrap
 
+.if ${BUILD_PACKAGES:M-ada} && ${BUILD_PACKAGES:M-dlang}
+bootstrap: ${ADA_PACKAGE} ${GCC_PACKAGE} ${GDC_PACKAGE} ${GXX_PACKAGE}
+.elif ${BUILD_PACKAGES:M-ada}
 bootstrap: ${ADA_PACKAGE} ${GCC_PACKAGE} ${GXX_PACKAGE}
+.elif ${BUILD_PACKAGES:M-dlang}
+bootstrap: ${GCC_PACKAGE} ${GDC_PACKAGE} ${GXX_PACKAGE}
+.else
+bootstrap: ${GCC_PACKAGE} ${GXX_PACKAGE}
+.endif
+	${_PBUILD} rm -rf ${WRKDIR}/prepare
 	${_PBUILD} mkdir -p ${WRKDIR}/prepare/bootstrap/system-libs
+.if ${BUILD_PACKAGES:M-ada}
 	cd ${WRKDIR}/prepare/bootstrap && ${_PBUILD} tar xzf ${ADA_PACKAGE}
+.endif
 	cd ${WRKDIR}/prepare/bootstrap && ${_PBUILD} tar xzf ${GCC_PACKAGE}
+.if ${BUILD_PACKAGES:M-dlang}
+	cd ${WRKDIR}/prepare/bootstrap && ${_PBUILD} tar xzf ${GDC_PACKAGE}
+.endif
 	cd ${WRKDIR}/prepare/bootstrap && ${_PBUILD} tar xzf ${GXX_PACKAGE}
 	${_PBUILD} rm -rf ${WRKDIR}/prepare/bootstrap/{+*,info,man,share}
 	${_PBUILD} rm -rf ${WRKDIR}/prepare/bootstrap/lib/gcc/*-openbsd*/$V/include-fixed
diff --git a/lang/gcc/11/distinfo b/lang/gcc/11/distinfo
index 8e22e181c2d..540fc2d25da 100644
--- a/lang/gcc/11/distinfo
+++ b/lang/gcc/11/distinfo
@@ -1,9 +1,9 @@
-SHA256 (gcc/adastrap-amd64-11.2.0-5.tar.xz) = xv2mjPXOBPnrbP98RlbKmbNgE3iP8MHBrShaipe/YNI=
+SHA256 (gcc/adastrap-amd64-11.2.0-6.tar.xz) = rxI866IO57k5nZGBVbaGynN0XRcA4QJIN1AAW3xNA1w=
 SHA256 (gcc/adastrap-i386-11.2.0-4.tar.xz) = 1T55LnFIsdo+lb3beM/FW0QR1U9RuHftAytxwRs8W/Y=
 SHA256 (gcc/adastrap-mips64-8.4.0-5.tar.xz) = Rfwenft0B3hxydQ3mqkkbFN40maQ73Jl4fgTFn1eNKQ=
 SHA256 (gcc/adastrap-powerpc-11.2.0-4.tar.xz) = 9KgiD7tqhcrCd8oTds/iVrmo9LXBNEAJQ+DdplytMuU=
 SHA256 (gcc/gcc-11.2.0.tar.xz) = 0I7cU2tUw3KhAQ/2YZ3SdMDxYDqkkhK6IPeqLNo2+os=
-SIZE (gcc/adastrap-amd64-11.2.0-5.tar.xz) = 78100312
+SIZE (gcc/adastrap-amd64-11.2.0-6.tar.xz) = 100826604
 SIZE (gcc/adastrap-i386-11.2.0-4.tar.xz) = 75923604
 SIZE (gcc/adastrap-mips64-8.4.0-5.tar.xz) = 49877060
 SIZE (gcc/adastrap-powerpc-11.2.0-4.tar.xz) = 70164724