diff --git a/bin/pkill/Makefile b/bin/pkill/Makefile
index 2eb3edea4cb2..302ac66e2b85 100644
--- a/bin/pkill/Makefile
+++ b/bin/pkill/Makefile
@@ -16,8 +16,8 @@ MLINKS=	pkill.1 pgrep.1
 # keep in mind that pkill is installed to /usr/bin in other
 # OS types, e.g., NetBSD, OpenBSD, Solaris, and Linux.
 #
-SYMLINKS=	${BINDIR}/pkill /usr/bin/pkill
-SYMLINKS+=	${BINDIR}/pgrep /usr/bin/pgrep
+SYMLINKS=	../..${BINDIR}/pkill /usr/bin/pkill
+SYMLINKS+=	../..${BINDIR}/pgrep /usr/bin/pgrep
 
 .if ${MK_TESTS} != "no"
 SUBDIR+= tests
diff --git a/lib/libxo/tests/encoder/Makefile b/lib/libxo/tests/encoder/Makefile
index 2fe42457f2e8..46820c87d1ef 100644
--- a/lib/libxo/tests/encoder/Makefile
+++ b/lib/libxo/tests/encoder/Makefile
@@ -8,7 +8,7 @@ SHLIB_NAME=	libenc_test.so
 
 LIBDIR=		${TESTSBASE}/lib/libxo
 
-SYMLINKS+=	${LIBDIR}/${SHLIB_NAME} /usr/lib/libxo/encoder/test.enc
+SYMLINKS+=	../../../tests/lib/libxo/${SHLIB_NAME} /usr/lib/libxo/encoder/test.enc
 
 SRCS=		enc_test.c
 
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index 7efe2f2cc929..01ccace94104 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -34,7 +34,7 @@ WARNS?=		2
 INSTALLFLAGS=	-C -b
 PRECIOUSPROG=
 BINDIR=		/libexec
-SYMLINKS=	${BINDIR}/${PROG} ${LIBEXECDIR}/${PROG}
+SYMLINKS=	../..${BINDIR}/${PROG} ${LIBEXECDIR}/${PROG}
 MLINKS=		rtld.1 ld-elf.so.1.1 \
 		rtld.1 ld.so.1
 
diff --git a/share/termcap/Makefile b/share/termcap/Makefile
index 6cb2ab752f78..5e026d9e2ecf 100644
--- a/share/termcap/Makefile
+++ b/share/termcap/Makefile
@@ -24,6 +24,6 @@ termcap.db: termcap
 	cap_mkdb ${CAP_MKDB_ENDIAN} -f ${.TARGET:R} ${.ALLSRC}
 
 etc-termcap:
-	${INSTALL_SYMLINK} ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap
+	${INSTALL_RSYMLINK} ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile
index 16974e211d92..266ca5ad1d3d 100644
--- a/usr.bin/chpass/Makefile
+++ b/usr.bin/chpass/Makefile
@@ -22,12 +22,12 @@ LIBADD=	crypt util
 LIBADD+=	ypclnt
 .endif 
 
-SYMLINKS=	${BINDIR}/chpass ${BINDIR}/chfn
-SYMLINKS+=	${BINDIR}/chpass ${BINDIR}/chsh
+SYMLINKS=	chpass ${BINDIR}/chfn
+SYMLINKS+=	chpass ${BINDIR}/chsh
 .if ${MK_NIS} != "no"
-SYMLINKS+=	${BINDIR}/chpass ${BINDIR}/ypchpass
-SYMLINKS+=	${BINDIR}/chpass ${BINDIR}/ypchfn
-SYMLINKS+=	${BINDIR}/chpass ${BINDIR}/ypchsh
+SYMLINKS+=	chpass ${BINDIR}/ypchfn
+SYMLINKS+=	chpass ${BINDIR}/ypchpass
+SYMLINKS+=	chpass ${BINDIR}/ypchsh
 .endif
 
 MLINKS=	chpass.1 chfn.1 chpass.1 chsh.1
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index fac1bb105809..1ec051fb3b36 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -9,7 +9,7 @@ BINMODE	 = 4555
 PRECIOUSPROG=
 LIBADD   = pam
 .if ${MK_NIS} != "no"
-SYMLINKS = ${BINDIR}/passwd ${BINDIR}/yppasswd
+SYMLINKS = passwd ${BINDIR}/yppasswd
 MLINKS	 = passwd.1 yppasswd.1
 .endif
 
diff --git a/usr.sbin/bsdinstall/partedit/Makefile b/usr.sbin/bsdinstall/partedit/Makefile
index 21d842e3fe4a..7d8f0659da25 100644
--- a/usr.sbin/bsdinstall/partedit/Makefile
+++ b/usr.sbin/bsdinstall/partedit/Makefile
@@ -4,7 +4,7 @@ BINDIR= ${LIBEXECDIR}/bsdinstall
 PROG=	partedit
 LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \
        ${BINDIR}/partedit ${BINDIR}/scriptedpart
-SYMLINKS= ${BINDIR}/partedit /usr/sbin/sade
+SYMLINKS= ../libexec/bsdinstall/partedit /usr/sbin/sade
 LIBADD+=	geom ncursesw util dialog m
 
 PARTEDIT_ARCH= ${MACHINE}
diff --git a/usr.sbin/mailwrapper/Makefile b/usr.sbin/mailwrapper/Makefile
index 29da770311e9..799d7e43fb71 100644
--- a/usr.sbin/mailwrapper/Makefile
+++ b/usr.sbin/mailwrapper/Makefile
@@ -10,19 +10,19 @@ LIBADD=	util
 .endif
 
 .if ${MK_MAILWRAPPER} != "no" || ${MK_SENDMAIL} != "no"
-SYMLINKS= 	${BINDIR}/mailwrapper /usr/sbin/sendmail  \
-		${BINDIR}/mailwrapper /usr/sbin/hoststat  \
-		${BINDIR}/mailwrapper /usr/sbin/purgestat \
-		${BINDIR}/mailwrapper /usr/bin/newaliases \
-		${BINDIR}/mailwrapper /usr/bin/mailq
+SYMLINKS=	../sbin/mailwrapper /usr/bin/mailq \
+		../sbin/mailwrapper /usr/bin/newaliases \
+		mailwrapper /usr/sbin/hoststat \
+		mailwrapper /usr/sbin/purgestat \
+		mailwrapper /usr/sbin/sendmail
 
 .if ${MK_MAILWRAPPER} == "no" && ${MK_SENDMAIL} != "no"
-SYMLINKS+=	/usr/libexec/sendmail/sendmail ${BINDIR}/mailwrapper
+SYMLINKS+=	../libexec/sendmail/sendmail ${BINDIR}/mailwrapper
 .endif
 .endif
 
 .if ${MK_MAILWRAPPER} != "no" && ${MK_SENDMAIL} == "no"
-SYMLINKS+=	${BINDIR}/mailwrapper /bin/rmail
+SYMLINKS+=	..${BINDIR}/mailwrapper /bin/rmail
 .endif
 
 .if ${MK_MAILWRAPPER} != "no"
diff --git a/usr.sbin/nologin/Makefile b/usr.sbin/nologin/Makefile
index 0b4c0db25d1c..d743f60c6a7c 100644
--- a/usr.sbin/nologin/Makefile
+++ b/usr.sbin/nologin/Makefile
@@ -4,7 +4,7 @@
 PROG=	nologin
 MAN=	nologin.5 nologin.8
 
-SYMLINKS=	${BINDIR}/nologin /sbin/nologin
+SYMLINKS=	..${BINDIR}/nologin /sbin/nologin
 
 # It is important that nologin be statically linked for security
 # reasons.  A dynamic non-setuid binary can be linked against a trojan