diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 47d425fc28..597b2b7d7f 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -19,14 +19,19 @@ conf_files="/etc/${pkgname}/${pkgname}.cfg"
 system_accounts="$pkgname"
 
 do_build() {
-	local TARGET
-	case "$XBPS_TARGET_LIBC" in
-	musl)	TARGET=linux-musl ;;
-	*)	TARGET=linux-glibc ;;
-	esac
+	local target atomic
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		target=linux-musl
+	else
+		target=linux-glibc
+	fi
+	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+		atomic="-latomic"
+	fi
 	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
-		TARGET=$TARGET USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
-		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1
+		TARGET=$target USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1 \
+		USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1 \
+		ADDLIB="$atomic"
 }
 
 do_check() {