diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 947dc10574ef..5e5c69d27b45 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.297 2016/03/12 23:08:58 mrg Exp $
+#	$NetBSD: bsd.prog.mk,v 1.298 2016/03/30 13:05:09 martin Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -540,7 +540,7 @@ ${_P}: .gdbinit ${LIBCRT0} ${LIBCRTI} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} \
 
 ${_P}.ro: ${OBJS.${_P}} ${_DPADD.${_P}}
 	${_MKTARGET_LINK}
-	${CC} ${LDFLAGS:N-Wl,-pie} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}
+	${CC} ${LDFLAGS:N-pie} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}
 
 .if defined(_PROGDEBUG.${_P})
 ${_PROGDEBUG.${_P}}: ${_P}
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index cdd6b7e22aa7..4b1153992a21 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.sys.mk,v 1.256 2016/03/22 08:17:27 mrg Exp $
+#	$NetBSD: bsd.sys.mk,v 1.257 2016/03/30 13:05:09 martin Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -178,9 +178,9 @@ AFLAGS+=	${CPUFLAGS}
 
 .if !defined(NOPIE) && (!defined(LDSTATIC) || ${LDSTATIC} != "-static")
 # Position Independent Executable flags
-PIE_CFLAGS?=        -fPIC
-PIE_LDFLAGS?=       -Wl,-pie ${${ACTIVE_CC} == "gcc":? -shared-libgcc :}
-PIE_AFLAGS?=	    -fPIC
+PIE_CFLAGS?=        -fPIE
+PIE_LDFLAGS?=       -pie ${${ACTIVE_CC} == "gcc":? -shared-libgcc :}
+PIE_AFLAGS?=	    -fPIE
 .endif
 
 ELF2ECOFF?=	elf2ecoff