diff --git a/lib/libssl/Makefile b/lib/libssl/Makefile
index a765a1045e43..c9a5c1e0e8fc 100644
--- a/lib/libssl/Makefile
+++ b/lib/libssl/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2007/05/28 12:06:22 tls Exp $
+#	$NetBSD: Makefile,v 1.15 2007/05/29 13:55:31 tls Exp $
 
 # RCSid:
 #	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -18,7 +18,7 @@
 
 .include <bsd.own.mk>
 
-USE_FORT=yes	# cryptographic software and network library
+USE_FORT?=yes	# cryptographic software and network library
 
 # XXX There's a bit of work to do before we can enable warnings.
 WARNS=0
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index da585e12b9fa..3698d08614c2 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.sys.mk,v 1.144 2007/05/29 04:56:34 tls Exp $
+#	$NetBSD: bsd.sys.mk,v 1.145 2007/05/29 13:55:31 tls Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -38,6 +38,9 @@ CPPFLAGS+=	${AUDIT:D-D__AUDIT__}
 CFLAGS+=	${CWARNFLAGS} ${NOGCCERROR:D:U-Werror}
 LINTFLAGS+=	${DESTDIR:D-d ${DESTDIR}/usr/include}
 
+.if (${MACHINE_ARCH} != "alpha") && (${MACHINE_ARCH} != "hppa") && \
+	(${MACHINE_ARCH} != "mips")
+
 .if defined(USE_FORT) && (${USE_FORT} != "no")
 USE_SSP=	yes
 .if !defined(KERNSRCDIR) && !defined(KERN) # not for kernels nor kern modules
@@ -57,6 +60,8 @@ LDADD+=		-lssp
 COPTS+=		-fstack-protector -Wstack-protector --param ssp-buffer-size=1
 .endif
 
+.endif
+
 .if defined(MKSOFTFLOAT) && (${MKSOFTFLOAT} != "no")
 COPTS+=		-msoft-float
 FOPTS+=		-msoft-float