diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index 7a7bb7faf4a1..80737e8c4409 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -40,7 +40,7 @@ CFLAGS+=	-fpic
 CFLAGS+=	-DPIC $(DEBUG)
 LDFLAGS+=	-shared -Wl,-Bsymbolic
 DPADD=		${LIBC_PIC}
-LDADD=		-lc_pic -lssp_nonshared
+LDADD=		-lc_pic
 
 .if ${MK_SYMVER} == "yes"
 LIBCDIR=	${TOPSRCDIR}/lib/libc
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index b3d3329366d8..e081e0984613 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -4390,6 +4390,7 @@ __stack_chk_fail(void)
 	_rtld_error("stack overflow detected; terminated");
 	die();
 }
+__weak_reference(__stack_chk_fail, __stack_chk_fail_local);
 
 void
 __chk_fail(void)