diff --git a/sysutils/edk2/Makefile b/sysutils/edk2/Makefile
--- a/sysutils/edk2/Makefile
+++ b/sysutils/edk2/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	edk2
-PORTVERSION=	g202005
+PORTVERSION=	g202102
 CATEGORIES=	sysutils
 
 MAINTAINER=	uboot@FreeBSD.org
@@ -21,18 +21,19 @@
 		bash:shells/bash
 
 # Both platform and non-osi repository don't have release, use latest known to work tag
-PLATFORM_TAG=	b716f363
-NONOSI_TAG=	f8023973
+PLATFORM_TAG=	89f6170d
+NONOSI_TAG=	f9b9957d
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tianocore
-GH_TAGNAME=	edk2-stable202005
+GH_TAGNAME=	edk2-stable202102
 GH_TUPLE=	tianocore:edk2-platforms:${PLATFORM_TAG}:platforms \
 		tianocore:edk2-non-osi:${NONOSI_TAG}:nonosi \
-		openssl:openssl:OpenSSL_1_1_1d-2-gc3656cc594:openssl/CryptoPkg/Library/OpensslLib/openssl \
+		openssl:openssl:OpenSSL_1_1_1g:openssl/CryptoPkg/Library/OpensslLib/openssl \
 		ucb-bar:berkeley-softfloat-3:master:softfloat/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 \
 		kkos:oniguruma:v6.9.4_mark1:oniguruma/MdeModulePkg/Universal/RegularExpressionDxe/oniguruma \
-		google:brotli:v1.0.7-17-g666c328:brotli/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
+		google:brotli:v1.0.7-17-g666c328:brotli/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli \
+		akheron:jansson:v2.13.1:jansson/RedfishPkg/Library/JsonLib/jansson
 
 BINARY_ALIAS=	make=${LOCALBASE}/bin/gmake \
 		dtc=${LOCALBASE}/bin/dtc \
diff --git a/sysutils/edk2/distinfo b/sysutils/edk2/distinfo
--- a/sysutils/edk2/distinfo
+++ b/sysutils/edk2/distinfo
@@ -1,15 +1,17 @@
-TIMESTAMP = 1596904500
-SHA256 (tianocore-edk2-g202005-edk2-stable202005_GH0.tar.gz) = 373c3eff3497316a48fcf4be8dcee227431cbce86dcd80a004950e992f0297e2
-SIZE (tianocore-edk2-g202005-edk2-stable202005_GH0.tar.gz) = 12721407
-SHA256 (tianocore-edk2-platforms-b716f363_GH0.tar.gz) = 22de162829ad0bd4be9e6d1eaa42b003d2449d44eff912998acfbaf82eeea1bc
-SIZE (tianocore-edk2-platforms-b716f363_GH0.tar.gz) = 7717885
-SHA256 (tianocore-edk2-non-osi-f8023973_GH0.tar.gz) = 36bf3a483350b91a98ed9b5b83210c29c9dce8ab8e5b0d106787e29810a9126a
-SIZE (tianocore-edk2-non-osi-f8023973_GH0.tar.gz) = 6903980
-SHA256 (openssl-openssl-OpenSSL_1_1_1d-2-gc3656cc594_GH0.tar.gz) = f5c33990f7319e50ede73a6689ebfbf2c63f42cca6833042d71c1c05e57bb40e
-SIZE (openssl-openssl-OpenSSL_1_1_1d-2-gc3656cc594_GH0.tar.gz) = 9017066
+TIMESTAMP = 1620893402
+SHA256 (tianocore-edk2-g202102-edk2-stable202102_GH0.tar.gz) = 268591f0db8fd1f8c977509e8ac37bd6090c8373bf63a9657c88bb27bb43a279
+SIZE (tianocore-edk2-g202102-edk2-stable202102_GH0.tar.gz) = 13604550
+SHA256 (tianocore-edk2-platforms-89f6170d_GH0.tar.gz) = 32643146d2244c5db6144bac139936cd57c0b20fc684b51e58904b6adc863e3c
+SIZE (tianocore-edk2-platforms-89f6170d_GH0.tar.gz) = 8445360
+SHA256 (tianocore-edk2-non-osi-f9b9957d_GH0.tar.gz) = 51f053f17b425d9bd2b3200aa4b36575a9e2220b2ce3a4329dd99906e57d4496
+SIZE (tianocore-edk2-non-osi-f9b9957d_GH0.tar.gz) = 8024464
+SHA256 (openssl-openssl-OpenSSL_1_1_1g_GH0.tar.gz) = 281e4f13142b53657bd154481e18195b2d477572fdffa8ed1065f73ef5a19777
+SIZE (openssl-openssl-OpenSSL_1_1_1g_GH0.tar.gz) = 9975550
 SHA256 (ucb-bar-berkeley-softfloat-3-master_GH0.tar.gz) = a40ccfa8d5c04971e6af8014217c93b58fba4d08c337bc0436bb141e9e79426a
 SIZE (ucb-bar-berkeley-softfloat-3-master_GH0.tar.gz) = 148747
 SHA256 (kkos-oniguruma-v6.9.4_mark1_GH0.tar.gz) = 7f7576c926f7d4a071d594a01691c477bbb9391df250378bd5e1c003d42b4318
 SIZE (kkos-oniguruma-v6.9.4_mark1_GH0.tar.gz) = 592141
 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 (akheron-jansson-v2.13.1_GH0.tar.gz) = f22901582138e3203959c9257cf83eba9929ac41d7be4a42557213a22ebcc7a0
+SIZE (akheron-jansson-v2.13.1_GH0.tar.gz) = 144979