diff --git a/nss/Pkgfile b/nss/Pkgfile
index 44c602fe5..3af67ddb2 100644
--- a/nss/Pkgfile
+++ b/nss/Pkgfile
@@ -5,7 +5,7 @@
 
 name=nss
 version=3.14.3
-release=1
+release=2
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_3_RTM/src/$name-$version.tar.gz \
         nss-config.in nss.pc.in)
 
@@ -14,6 +14,14 @@ build() {
 
     local file
 
+         # Do not override CC from commands.mk
+         # CCC is unused for g++, comment out
+         # And respect system CFLAGS
+         sed -i mozilla/security/coreconf/Linux.mk \
+                 -e 's|^CC.*=.*gcc$|#&|' \
+                 -e 's|^CCC.*=.*g++$|#&|' \
+                 -e "s|^OS_CFLAGS.*= |& $CFLAGS |"
+
     export NSPR_INCLUDE_DIR=/usr/include/nspr
     export NSPR_LIB_DIR=/usr/lib
     export NSS_USE_SYSTEM_SQLITE=1