Index: Makefile.inc
===================================================================
RCS file: /cvs/src/usr.bin/ssh/Makefile.inc,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile.inc
--- Makefile.inc	1 Jul 2015 23:10:47 -0000	1.50
+++ Makefile.inc	1 Aug 2016 01:19:07 -0000
@@ -4,6 +4,7 @@
 
 CFLAGS+=	-I${.CURDIR}/..
 CFLAGS+=	-fstack-protector-all
+CFLAGS+=	-Dpledge\(a,b\)=0
 
 CDIAGFLAGS=	-Wall
 CDIAGFLAGS+=	-Wchar-subscripts
Index: sshd/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/ssh/sshd/Makefile,v
retrieving revision 1.88
diff -u -p -r1.88 Makefile
--- sshd/Makefile	14 Jan 2016 16:17:40 -0000	1.88
+++ sshd/Makefile	1 Aug 2016 01:19:07 -0000
@@ -17,7 +17,7 @@ SRCS=	sshd.c auth-rhosts.c auth-passwd.c
 	auth2-none.c auth2-passwd.c auth2-pubkey.c \
 	monitor_mm.c monitor.c monitor_wrap.c \
 	sftp-server.c sftp-common.c \
-	sandbox-pledge.c
+	sandbox-rlimit.c
 
 .if (${SSH1:L} == "yes")
 SRCS+=	auth-rsa.c auth-rh-rsa.c auth1.c