Index: sysutils/uefi-edk2-bhyve/Makefile
===================================================================
--- sysutils/uefi-edk2-bhyve/Makefile
+++ sysutils/uefi-edk2-bhyve/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	uefi-edk2-bhyve
-PORTVERSION=	g20210226
+PORTVERSION=	g20211212
 PORTEPOCH=	2
 CATEGORIES=	sysutils
 
@@ -24,12 +24,13 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	tianocore
 GH_PROJECT=	edk2
-GH_TAGNAME=	edk2-stable202102
+GH_TAGNAME=	edk2-stable202111
 GH_TUPLE=	ucb-bar:berkeley-softfloat-3:master:softfloat/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 \
 		google:brotli:v1.0.7-17-g666c328:brotli/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli \
-		openssl:openssl:OpenSSL_1_1_1g:openssl/CryptoPkg/Library/OpensslLib/openssl \
+		openssl:openssl:OpenSSL_1_1_1j:openssl/CryptoPkg/Library/OpensslLib/openssl \
 		kkos:oniguruma:v6.9.4_mark1:oniguruma/MdeModulePkg/Universal/RegularExpressionDxe/oniguruma \
 		akheron:jansson:v2.13.1:jansson/RedfishPkg/Library/JsonLib/jansson \
+		tianocore:edk2-cmocka:cmocka-1.1.5-23-g1cc9cde:UnitTestFrameworkPkg/Library/CmockaLib/cmocka
 
 BINARY_ALIAS=	make=${LOCALBASE}/bin/gmake \
 		gcc=${LOCALBASE}/bin/gcc${GCC_DEFAULT} \
Index: sysutils/uefi-edk2-bhyve/distinfo
===================================================================
--- sysutils/uefi-edk2-bhyve/distinfo
+++ sysutils/uefi-edk2-bhyve/distinfo
@@ -1,13 +1,15 @@
-TIMESTAMP = 1619914029
-SHA256 (tianocore-edk2-g20210226-edk2-stable202102_GH0.tar.gz) = 268591f0db8fd1f8c977509e8ac37bd6090c8373bf63a9657c88bb27bb43a279
-SIZE (tianocore-edk2-g20210226-edk2-stable202102_GH0.tar.gz) = 13604550
-SHA256 (ucb-bar-berkeley-softfloat-3-master_GH0.tar.gz) = a40ccfa8d5c04971e6af8014217c93b58fba4d08c337bc0436bb141e9e79426a
-SIZE (ucb-bar-berkeley-softfloat-3-master_GH0.tar.gz) = 148747
+TIMESTAMP = 1639338009
+SHA256 (tianocore-edk2-g20211212-edk2-stable202111_GH0.tar.gz) = 7523bde01af809d5b1e81d5059b1eb6f9cecd99422c3317ae3614ef20e956917
+SIZE (tianocore-edk2-g20211212-edk2-stable202111_GH0.tar.gz) = 14085385
+SHA256 (ucb-bar-berkeley-softfloat-3-master_GH0.tar.gz) = 01ed06cf7c3eb038a8a7421d720be591e207d38cc40f02b08e1d24cc29e31f14
+SIZE (ucb-bar-berkeley-softfloat-3-master_GH0.tar.gz) = 148788
 SHA256 (google-brotli-v1.0.7-17-g666c328_GH0.tar.gz) = caed254751585590b20b4a34d6600e9c9aae153ab1f9e1ae6b67f9bc3ee09b92
 SIZE (google-brotli-v1.0.7-17-g666c328_GH0.tar.gz) = 23854268
-SHA256 (openssl-openssl-OpenSSL_1_1_1g_GH0.tar.gz) = 281e4f13142b53657bd154481e18195b2d477572fdffa8ed1065f73ef5a19777
-SIZE (openssl-openssl-OpenSSL_1_1_1g_GH0.tar.gz) = 9975550
+SHA256 (openssl-openssl-OpenSSL_1_1_1j_GH0.tar.gz) = 22d6588e4a7c5ad48fcac2fbf1d035bd43258c22a49457dad0539ded0651b4d2
+SIZE (openssl-openssl-OpenSSL_1_1_1j_GH0.tar.gz) = 9994760
 SHA256 (kkos-oniguruma-v6.9.4_mark1_GH0.tar.gz) = 7f7576c926f7d4a071d594a01691c477bbb9391df250378bd5e1c003d42b4318
 SIZE (kkos-oniguruma-v6.9.4_mark1_GH0.tar.gz) = 592141
 SHA256 (akheron-jansson-v2.13.1_GH0.tar.gz) = f22901582138e3203959c9257cf83eba9929ac41d7be4a42557213a22ebcc7a0
 SIZE (akheron-jansson-v2.13.1_GH0.tar.gz) = 144979
+SHA256 (tianocore-edk2-cmocka-cmocka-1.1.5-23-g1cc9cde_GH0.tar.gz) = c2fb00395a55abd2ebfc2fcfe2705c7096cedd4416704dbb9237e394607fccb4
+SIZE (tianocore-edk2-cmocka-cmocka-1.1.5-23-g1cc9cde_GH0.tar.gz) = 100320