diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 6bec2b87fdb..384847dd360 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -119,11 +119,6 @@ BUILD_DEPENDS+=	rust-cbindgen>=0.6.8:devel/rust-cbindgen \
 MOZ_OPTIONS+=	--enable-pie
 .endif
 
-.if ${MOZILLA_VER:R:R} >= 65
-# Let vendor add -fstack-protector-strong on all architectures
-SSP_UNSAFE=		yes
-.endif
-
 MOZILLA_SUFX?=	none
 MOZSRC?=	${WRKSRC}
 PLISTF?=	${WRKDIR}/plist_files
diff --git a/Mk/bsd.ssp.mk b/Mk/bsd.ssp.mk
index e425e5bd16f..dd4b1e39a69 100644
--- a/Mk/bsd.ssp.mk
+++ b/Mk/bsd.ssp.mk
@@ -4,14 +4,9 @@
 SSP_Include_MAINTAINER=	portmgr@FreeBSD.org
 
 .if !defined(SSP_UNSAFE) && \
-    (${ARCH} == i386 || ${ARCH} == amd64)
+    (${MACHINE} != "mips")
 # Overridable as a user may want to use -fstack-protector
 SSP_CFLAGS?=	-fstack-protector-all
 CFLAGS+=	${SSP_CFLAGS}
-LDFLAGS+=	-fstack-protector
-# -lssp_nonshared is needed on i386 where /usr/lib/libc.so is not an ldscript
-# This is currently unused XXX
-.	if defined(SSP_NEED_NONSHARED)
-LDFLAGS+=	-lssp_nonshared
-.	endif
+LDFLAGS+=	${SSP_CFLAGS}
 .endif