diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template
index 10433489ea3..b700e6f5d91 100644
--- a/srcpkgs/protobuf/template
+++ b/srcpkgs/protobuf/template
@@ -1,8 +1,9 @@
 # Template file for 'protobuf'
 pkgname=protobuf
-version=21.6
+version=21.7
 revision=1
-wrksrc="protobuf-${version}"
+create_wrksrc="yes"
+build_wrksrc="${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config automake libtool"
 makedepends="zlib-devel"
@@ -11,10 +12,11 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
 changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt"
-distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz"
-checksum=dbb16fdbca8f277c9a194d9a837395cde408ca136738d94743130dd0de015efd
-# Checks rely on googletest
-make_check=no
+_googletest_commit="5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081"
+distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz
+ https://github.com/google/googletest/archive/${_googletest_commit}.tar.gz"
+checksum="75be42bd736f4df6d702a0e4e4d30de9ee40eac024c4b845d17ae4cc831fe4ae
+ 0e2f36e8e403c125fd0ab02171bdb786d3b6b3875b6ccf3b2eb7969be8faecd0"
 
 # Switch to versioned package
 conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0
@@ -32,6 +34,11 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	LDFLAGS+=" -latomic"
 fi
 
+post_extract() {
+	rmdir "${build_wrksrc}/third_party/googletest"
+	mv "googletest-${_googletest_commit}" "${build_wrksrc}/third_party/googletest"
+}
+
 pre_configure() {
 	autoreconf -fi
 }