diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index be15396d4d..cdeef3155c 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -22,10 +22,20 @@ checksum="c2ab8a42a0d673c1acb596d276055adcc074c1116e427f118415da3e79e52969
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" grpc"   # need host grpc_cpp_plugin
 fi
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+fi
 
 post_extract() {
 	rm -rf third_party/abseil-cpp
 	mv ../abseil-cpp-${_abseilver} third_party/abseil-cpp
+
+	case "$XBPS_TARGET_MACHINE" in
+	*-musl)
+		sed -i 's/stacktrace_generic/stacktrace_unimplemented/g' third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h ;;
+	esac
+
 }
 
 grpc-devel_package() {