diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 2439b2ff3b6..7e726620dcd 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -1,7 +1,7 @@
 # Template file for 'nss'
 pkgname=nss
 version=3.18.1
-revision=1
+revision=2
 hostmakedepends="perl"
 makedepends="zlib-devel nspr-devel sqlite-devel"
 depends="nspr>=4.10.7"
@@ -21,9 +21,12 @@ do_build() {
 	export NSS_USE_SYSTEM_SQLITE=1
 	export NSS_ENABLE_ECC=1
 
-	if [ "$XBPS_MACHINE" = "x86_64" ]; then
-		_use64="USE_64=1"
-	fi
+	case "$XBPS_TARGET_MACHINE" in
+		aarch64*|x86_64*) _use64="USE_64=1";;
+	esac
+	case "$XBPS_TARGET_MACHINE" in
+		*-musl) CFLAGS+=" -UHAVE_SYS_CDEFS_H";;
+	esac
 
 	cd nss
 	# Build nsinstall for host.