diff --git a/security/boringssl/Makefile b/security/boringssl/Makefile
index 10e2c1c4e4a1..bb2d1b128463 100644
--- a/security/boringssl/Makefile
+++ b/security/boringssl/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	boringssl
 PORTVERSION=	0.0.0.0.2021.12.21.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fork of OpenSSL
 
 LICENSE=	OpenSSL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake:insource cpe go:no_targets localbase perl5
 
 CPE_VENDOR=	google
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
 GH_TAGNAME=	9bcc12d
 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/pkg-plist b/security/boringssl/pkg-plist
index ffcf61e0ef87..e4e699e64689 100644
--- a/security/boringssl/pkg-plist
+++ b/security/boringssl/pkg-plist
@@ -1,89 +1,86 @@
 bin/bssl
 include/openssl/aead.h
 include/openssl/aes.h
 include/openssl/arm_arch.h
 include/openssl/asn1_mac.h
 include/openssl/asn1.h
 include/openssl/asn1t.h
 include/openssl/base.h
 include/openssl/base64.h
 include/openssl/bio.h
 include/openssl/blake2.h
 include/openssl/blowfish.h
 include/openssl/bn.h
-include/openssl/bn.h.bak
 include/openssl/buf.h
 include/openssl/buffer.h
 include/openssl/bytestring.h
 include/openssl/cast.h
 include/openssl/chacha.h
 include/openssl/cipher.h
 include/openssl/cmac.h
 include/openssl/conf.h
 include/openssl/cpu.h
 include/openssl/crypto.h
 include/openssl/curve25519.h
 include/openssl/des.h
 include/openssl/dh.h
 include/openssl/digest.h
 include/openssl/dsa.h
 include/openssl/dtls1.h
 include/openssl/e_os2.h
 include/openssl/ec_key.h
 include/openssl/ec.h
 include/openssl/ecdh.h
 include/openssl/ecdsa.h
 include/openssl/engine.h
 include/openssl/err.h
 include/openssl/evp_errors.h
 include/openssl/evp.h
 include/openssl/ex_data.h
 include/openssl/hkdf.h
 include/openssl/hmac.h
 include/openssl/hpke.h
 include/openssl/hrss.h
 include/openssl/is_boringssl.h
 include/openssl/lhash.h
 include/openssl/md4.h
 include/openssl/md5.h
 include/openssl/mem.h
 include/openssl/nid.h
 include/openssl/obj_mac.h
 include/openssl/obj.h
 include/openssl/objects.h
 include/openssl/opensslconf.h
 include/openssl/opensslv.h
 include/openssl/ossl_typ.h
 include/openssl/pem.h
 include/openssl/pkcs12.h
 include/openssl/pkcs7.h
-include/openssl/pkcs7.h.bak
 include/openssl/pkcs8.h
 include/openssl/poly1305.h
 include/openssl/pool.h
 include/openssl/rand.h
 include/openssl/rc4.h
 include/openssl/ripemd.h
 include/openssl/rsa.h
 include/openssl/safestack.h
 include/openssl/sha.h
 include/openssl/siphash.h
 include/openssl/span.h
 include/openssl/srtp.h
 include/openssl/ssl.h
-include/openssl/ssl.h.bak
 include/openssl/ssl3.h
 include/openssl/stack.h
 include/openssl/thread.h
 include/openssl/tls1.h
 include/openssl/trust_token.h
 include/openssl/type_check.h
 include/openssl/x509_vfy.h
 include/openssl/x509.h
 include/openssl/x509v3.h
 lib/libcrypto.so
 lib/libcrypto.so.1
 lib/libcrypto.so.1.0.0
 lib/libssl.so
 lib/libssl.so.1
 lib/libssl.so.1.0.0