diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 71db371ee38..e85ccc945a3 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -31,19 +31,14 @@ build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayl
 build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
 
 case $XBPS_TARGET_MACHINE in
+	armv6*) broken="required NEON extensions are not supported on armv6" ;;
 	ppc64*) ;;
-	ppc*) broken="ftbfs in several places" ;;
+	ppc*) broken="xptcall bitrot" ;;
 esac
 
-case $XBPS_TARGET_MACHINE in
-	armv6*)
-		broken="required NEON extensions are not supported on armv6"
-		;;
-	ppc64*) ;;
-	ppc*)
-		makedepends+=" libatomic-devel"
-		;;
-esac
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
 
 # we need this because cargo verifies checksums of all files in vendor
 # crates when it builds and gives us no way to override or update the
@@ -89,15 +84,15 @@ do_build() {
 	esac
 
 	# webrtc currently fails to build on 32-bit ppc...
-	# also need explicit libatomic
 	case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
-	ppc*)
-		echo "ac_add_options --disable-webrtc" >>.mozconfig
-		export LDFLAGS+=" -latomic"
-		;;
+	ppc*) echo "ac_add_options --disable-webrtc" >>.mozconfig ;;
 	esac
 
+	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+		export LDFLAGS+=" -latomic"
+	fi
+
 	case "$XBPS_TARGET_MACHINE" in
 	x86_64-musl|i686-musl)
 		echo "ac_add_options --host=${XBPS_TRIPLET}" >>.mozconfig