diff -ur usr.bin.orig/at/Makefile usr.bin.setXid/at/Makefile
--- usr.bin.orig/at/Makefile	Thu Apr  7 20:52:57 2005
+++ usr.bin.setXid/at/Makefile	Thu Apr  7 21:21:02 2005
@@ -15,6 +15,8 @@
 BINMODE= 4555
 CLEANFILES+= at.1
 
+LDFLAGS+=-Wl,-z,now
+
 at.1: at.man
 	@${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \
 	sed -e \
diff -ur usr.bin.orig/chpass/Makefile usr.bin.setXid/chpass/Makefile
--- usr.bin.orig/chpass/Makefile	Thu Apr  7 20:52:57 2005
+++ usr.bin.setXid/chpass/Makefile	Thu Apr  7 21:22:40 2005
@@ -15,6 +15,8 @@
 #CFLAGS+=-DRESTRICT_FULLNAME_CHANGE
 CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../lib/libc/gen -I.
 
+LDFLAGS+=-Wl,-z,now
+
 DPADD=	${LIBCRYPT} ${LIBUTIL}
 LDADD=	-lcrypt -lutil
 .if !defined(NO_NIS)
diff -ur usr.bin.orig/fstat/Makefile usr.bin.setXid/fstat/Makefile
--- usr.bin.orig/fstat/Makefile	Thu Apr  7 20:52:57 2005
+++ usr.bin.setXid/fstat/Makefile	Thu Apr  7 21:24:35 2005
@@ -9,4 +9,6 @@
 BINMODE=2555
 WARNS?=	6
 
+LDFLAGS+=-Wl,-z,now
+
 .include <bsd.prog.mk>
diff -ur usr.bin.orig/lock/Makefile usr.bin.setXid/lock/Makefile
--- usr.bin.orig/lock/Makefile	Thu Apr  7 20:52:57 2005
+++ usr.bin.setXid/lock/Makefile	Thu Apr  7 21:24:45 2005
@@ -7,4 +7,6 @@
 DPADD=	${LIBCRYPT}
 LDADD=	-lcrypt
 
+LDFLAGS+=-Wl,-z,now
+
 .include <bsd.prog.mk>
diff -ur usr.bin.orig/login/Makefile usr.bin.setXid/login/Makefile
--- usr.bin.orig/login/Makefile	Thu Apr  7 20:52:57 2005
+++ usr.bin.setXid/login/Makefile	Thu Apr  7 21:24:55 2005
@@ -13,4 +13,6 @@
 INSTALLFLAGS=-fschg
 .endif
 
+LDFLAGS+=-Wl,-z,now
+
 .include <bsd.prog.mk>
diff -ur usr.bin.orig/netstat/Makefile usr.bin.setXid/netstat/Makefile
--- usr.bin.orig/netstat/Makefile	Thu Apr  7 20:52:58 2005
+++ usr.bin.setXid/netstat/Makefile	Thu Apr  7 21:25:08 2005
@@ -14,4 +14,6 @@
 DPADD=	${LIBKVM} ${LIBIPX} ${LIBNETGRAPH} ${LIBUTIL}
 LDADD=	-lkvm -lipx -lnetgraph -lutil
 
+LDFLAGS+=-Wl,-z,now
+
 .include <bsd.prog.mk>
diff -ur usr.bin.orig/opieinfo/Makefile usr.bin.setXid/opieinfo/Makefile
--- usr.bin.orig/opieinfo/Makefile	Thu Apr  7 20:52:58 2005
+++ usr.bin.setXid/opieinfo/Makefile	Thu Apr  7 21:25:20 2005
@@ -11,6 +11,8 @@
 DPADD=	${LIBOPIE} ${LIBMD}
 LDADD=	-lopie -lmd
 
+LDFLAGS+=-Wl,-z,now
+
 BINOWN=	root
 BINMODE=4555
 INSTALLFLAGS=-fschg
diff -ur usr.bin.orig/opiepasswd/Makefile usr.bin.setXid/opiepasswd/Makefile
--- usr.bin.orig/opiepasswd/Makefile	Thu Apr  7 20:52:58 2005
+++ usr.bin.setXid/opiepasswd/Makefile	Thu Apr  7 21:25:29 2005
@@ -11,6 +11,8 @@
 DPADD=	${LIBOPIE} ${LIBMD}
 LDADD=	-lopie -lmd
 
+LDFLAGS+=-Wl,-z,now
+
 BINOWN=	root
 BINMODE=4555
 INSTALLFLAGS=-fschg
diff -ur usr.bin.orig/passwd/Makefile usr.bin.setXid/passwd/Makefile
--- usr.bin.orig/passwd/Makefile	Thu Apr  7 20:52:58 2005
+++ usr.bin.setXid/passwd/Makefile	Thu Apr  7 21:25:37 2005
@@ -10,6 +10,8 @@
 MLINKS	 = passwd.1 yppasswd.1
 WARNS	?= 4
 
+LDFLAGS+=-Wl,-z,now
+
 beforeinstall:
 .for i in passwd yppasswd
 	[ ! -e ${DESTDIR}${BINDIR}/$i ] || \
--- usr.bin.orig/su/Makefile	Thu Apr  7 20:52:58 2005
+++ usr.bin.setXid/su/Makefile	Thu Apr  7 21:26:00 2005
@@ -10,4 +10,6 @@
 BINMODE=4555
 INSTALLFLAGS=-fschg
 
+LDFLAGS+=-Wl,-z,now
+
 .include <bsd.prog.mk>
diff -ur usr.bin.orig/wall/Makefile usr.bin.setXid/wall/Makefile
--- usr.bin.orig/wall/Makefile	Thu Apr  7 20:52:59 2005
+++ usr.bin.setXid/wall/Makefile	Thu Apr  7 21:26:07 2005
@@ -5,4 +5,6 @@
 BINGRP=	tty
 BINMODE=2555
 
+LDFLAGS+=-Wl,-z,now
+
 .include <bsd.prog.mk>
diff -ur usr.bin.orig/write/Makefile usr.bin.setXid/write/Makefile
--- usr.bin.orig/write/Makefile	Thu Apr  7 20:52:59 2005
+++ usr.bin.setXid/write/Makefile	Thu Apr  7 21:26:13 2005
@@ -4,4 +4,6 @@
 BINMODE=2555
 BINGRP=	tty
 
+LDFLAGS+=-Wl,-z,now
+
 .include <bsd.prog.mk>