diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index 140751c8ac50..978e8ac7e558 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.i386,v 1.96 1999/01/15 23:37:06 thorpej Exp $
+#	$NetBSD: Makefile.i386,v 1.97 1999/01/28 20:04:54 christos Exp $
 
 # Makefile for NetBSD
 #
@@ -18,6 +18,8 @@
 # -DTRACE	compile in kernel tracing hooks
 # -DQUOTA	compile in file system quotas
 
+.include <bsd.own.mk>
+
 # DEBUG is set to -g if debugging.
 # PROF is set to -pg if profiling.
 
@@ -52,7 +54,12 @@ CWARNFLAGS+=	-Wno-main
 .endif
 CFLAGS=		${DEBUG} ${COPTS} ${CWARNFLAGS}
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
-LINKFLAGS=	-z -Ttext F0100000 -e start
+LINKFLAGS=	-Ttext F0100000 -e start
+.if (${OBJECT_FMT} == "ELF")
+#LINKFLAGS+=	-N
+.else
+LINKFLAGS+=	-z
+.endif
 STRIPFLAGS=	-d
 
 ### find out what to use for libkern