diff --git a/security/boringssl/Makefile b/security/boringssl/Makefile
index e4d0ab333a3d..cbb79d308744 100644
--- a/security/boringssl/Makefile
+++ b/security/boringssl/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	boringssl
-PORTVERSION=	0.0.0.0.2022.01.14.01
+PORTVERSION=	0.0.0.0.2022.01.18.01
 CATEGORIES=	security
 
 MAINTAINER=	osa@FreeBSD.org
 COMMENT=	Fork of OpenSSL
 
 LICENSE=	OpenSSL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake:insource cpe go:no_targets localbase perl5
 
 CONFLICTS_INSTALL=	security/libressl \
 			security/libressl-devel \
 			security/openssl \
 			security/openssl-devel \
 			security/openssl-quictls
 
 CPE_VENDOR=	google
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
-GH_TAGNAME=	ec476ef
+GH_TAGNAME=	36a41bf
 GH_TUPLE=	golang:crypto:c07d793c2f9a:golang_crypto/vendor/golang.org/x/crypto \
 		golang:net:04defd469f4e:golang_net/vendor/golang.org/x/net \
 		golang:sys:04245dca01da:golang_sys/vendor/golang.org/x/sys \
 		golang:term:7de9c90e9dd1:golang_term/vendor/golang.org/x/term
 CMAKE_ARGS+=	-DBUILD_SHARED_LIBS=1 \
 		-DCMAKE_BUILD_TYPE=Release
 USE_LDCONFIG=	yes
 LDFLAGS+=	-Wl,-rpath,${LOCALBASE}/lib
 TEST_TARGET=	run_tests
 GO_BUILDFLAGS+=	-mod=vendor
 MAKE_ENV+=	GOPATH=${WRKSRC}/vendor GOPROXY=off
 
 post-patch:
 	@${GREP} -FRl -- '-D_XOPEN_SOURCE=700' ${WRKSRC} | \
 		${XARGS} ${REINPLACE_CMD} -e 's,-D_XOPEN_SOURCE=700,,'
 	@${GREP} -FRl '${GO_EXECUTABLE} run ' ${WRKSRC} | \
 		${XARGS} ${REINPLACE_CMD} -r -e 's,([$][{]GO_EXECUTABLE[}] run),\1 ${GO_BUILDFLAGS},'
 	@${FIND} ${WRKSRC}/include -name '*.bak' -delete
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tool/bssl ${STAGEDIR}${PREFIX}/bin/
 	(cd ${WRKSRC}/include && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include)
 	${INSTALL_LIB} ${WRKSRC}/crypto/libcrypto.so ${STAGEDIR}${PREFIX}/lib/libcrypto.so.1.0.0
 	${INSTALL_LIB} ${WRKSRC}/ssl/libssl.so ${STAGEDIR}${PREFIX}/lib/libssl.so.1.0.0
 	${LN} -sf libcrypto.so.1 ${STAGEDIR}${PREFIX}/lib/libcrypto.so
 	${LN} -sf libcrypto.so.1.0.0 ${STAGEDIR}${PREFIX}/lib/libcrypto.so.1
 	${LN} -sf libssl.so.1 ${STAGEDIR}${PREFIX}/lib/libssl.so
 	${LN} -sf libssl.so.1.0.0 ${STAGEDIR}${PREFIX}/lib/libssl.so.1
 
 .include <bsd.port.mk>
diff --git a/security/boringssl/distinfo b/security/boringssl/distinfo
index f3e39cb59b79..98731b08c5cd 100644
--- a/security/boringssl/distinfo
+++ b/security/boringssl/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1642258524
-SHA256 (google-boringssl-0.0.0.0.2022.01.14.01-ec476ef_GH0.tar.gz) = 42c7081208ae9a91c88a2798c851e2a2c08961fab4d072ff1f9c70da3c3564ef
-SIZE (google-boringssl-0.0.0.0.2022.01.14.01-ec476ef_GH0.tar.gz) = 30723952
+TIMESTAMP = 1642598328
+SHA256 (google-boringssl-0.0.0.0.2022.01.18.01-36a41bf_GH0.tar.gz) = 3b5196f7bd2d40d69fb136d115e2d551891aa1aad50e233a8afa5e827a0ece48
+SIZE (google-boringssl-0.0.0.0.2022.01.18.01-36a41bf_GH0.tar.gz) = 30726833
 SHA256 (golang-crypto-c07d793c2f9a_GH0.tar.gz) = bd1e0856c43287c6ebd20d59e2b4f2ffa91c5cc275dbb02bb2cfc822e6dc18a4
 SIZE (golang-crypto-c07d793c2f9a_GH0.tar.gz) = 1732023
 SHA256 (golang-net-04defd469f4e_GH0.tar.gz) = 6009a6f0989341df975799276ff1c49af650d4a4ed3fd6db3501b91eb601810d
 SIZE (golang-net-04defd469f4e_GH0.tar.gz) = 1252122
 SHA256 (golang-sys-04245dca01da_GH0.tar.gz) = b90ec2bae1f7e395eb368638a6627199efdc28fa9c592a72aac0ae32351fd5d7
 SIZE (golang-sys-04245dca01da_GH0.tar.gz) = 1231301
 SHA256 (golang-term-7de9c90e9dd1_GH0.tar.gz) = 73603eaab2ab2bfe05061d64ad09f8ed7469de6964a672398f7bf82cffb4b1da
 SIZE (golang-term-7de9c90e9dd1_GH0.tar.gz) = 15239