diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index caf0ffeeb69..a395ab33b5e 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -23,9 +23,10 @@ case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS="-D__LINUX_NETFILTER_H";;
 esac
 
-case "$XBPS_TARGET_MACHINE" in
-	armv[56]*|mips*|ppc|ppc-musl) ADDLIB="-latomic"; makedepends+=" libatomic-devel";;
-esac
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	ADDLIB="-latomic"
+fi
 
 
 do_build() {