diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index a93946f2b323..dbd8d2a77f6c 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.775 2008/09/26 07:02:57 rtr Exp $
+# $NetBSD: mi,v 1.776 2008/10/12 23:00:53 mrg Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -1160,6 +1160,7 @@
 ./usr/libdata/debug/usr/libexec/uucp		base-obsolete		obsolete
 ./usr/libdata/debug/usr/sbin			base-sys-usr
 ./usr/libdata/firmware				base-sys-usr
+./usr/libdata/ldscripts				base-c-usr
 ./usr/libdata/lint				base-c-usr
 ./usr/libexec					base-sys-usr
 ./usr/libexec/atf-cleanup			base-atf-bin
@@ -2494,7 +2495,7 @@
 ./usr/share/keymaps/amiga			base-sys-share
 ./usr/share/keymaps/atari			base-sys-share
 ./usr/share/keymaps/x68k			base-sys-share
-./usr/share/ldscripts				base-util-share
+./usr/share/ldscripts				base-obsolete		obsolete
 ./usr/share/legal				base-sys-share
 ./usr/share/legal/COPYRIGHT			base-sys-share
 ./usr/share/lkm					base-obsolete		obsolete
diff --git a/distrib/sets/lists/comp/md.amd64 b/distrib/sets/lists/comp/md.amd64
index 39af442104fc..ab60ac13c038 100644
--- a/distrib/sets/lists/comp/md.amd64
+++ b/distrib/sets/lists/comp/md.amd64
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.33 2008/05/11 15:32:20 ad Exp $
+# $NetBSD: md.amd64,v 1.34 2008/10/12 23:00:53 mrg Exp $
 ./usr/include/amd64				comp-c-include
 ./usr/include/amd64/ansi.h			comp-c-include
 ./usr/include/amd64/aout_machdep.h		comp-c-include
@@ -166,35 +166,67 @@
 ./usr/libdata/debug/usr/bin/fdformat.debug	comp-util-debug		debug
 ./usr/libdata/debug/usr/sbin/acpidump.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/amldb.debug	comp-sysutil-debug	debug
+./usr/libdata/ldscripts/elf_i386.x		comp-util-bin
+./usr/libdata/ldscripts/elf_i386.xbn		comp-util-bin
+./usr/libdata/ldscripts/elf_i386.xc		comp-util-bin
+./usr/libdata/ldscripts/elf_i386.xd		comp-util-bin
+./usr/libdata/ldscripts/elf_i386.xdc		comp-util-bin
+./usr/libdata/ldscripts/elf_i386.xdw		comp-util-bin
+./usr/libdata/ldscripts/elf_i386.xn		comp-util-bin
+./usr/libdata/ldscripts/elf_i386.xr		comp-util-bin
+./usr/libdata/ldscripts/elf_i386.xs		comp-util-bin
+./usr/libdata/ldscripts/elf_i386.xsc		comp-util-bin
+./usr/libdata/ldscripts/elf_i386.xsw		comp-util-bin
+./usr/libdata/ldscripts/elf_i386.xu		comp-util-bin
+./usr/libdata/ldscripts/elf_i386.xw		comp-util-bin
+./usr/libdata/ldscripts/elf_x86_64.x		comp-util-bin
+./usr/libdata/ldscripts/elf_x86_64.xbn		comp-util-bin
+./usr/libdata/ldscripts/elf_x86_64.xc		comp-util-bin
+./usr/libdata/ldscripts/elf_x86_64.xd		comp-util-bin
+./usr/libdata/ldscripts/elf_x86_64.xdc		comp-util-bin
+./usr/libdata/ldscripts/elf_x86_64.xdw		comp-util-bin
+./usr/libdata/ldscripts/elf_x86_64.xn		comp-util-bin
+./usr/libdata/ldscripts/elf_x86_64.xr		comp-util-bin
+./usr/libdata/ldscripts/elf_x86_64.xs		comp-util-bin
+./usr/libdata/ldscripts/elf_x86_64.xsc		comp-util-bin
+./usr/libdata/ldscripts/elf_x86_64.xsw		comp-util-bin
+./usr/libdata/ldscripts/elf_x86_64.xu		comp-util-bin
+./usr/libdata/ldscripts/elf_x86_64.xw		comp-util-bin
+./usr/libdata/ldscripts/i386nbsd.x		comp-util-bin
+./usr/libdata/ldscripts/i386nbsd.xbn		comp-util-bin
+./usr/libdata/ldscripts/i386nbsd.xn		comp-util-bin
+./usr/libdata/ldscripts/i386nbsd.xr		comp-util-bin
+./usr/libdata/ldscripts/i386nbsd.xu		comp-util-bin
 ./usr/libdata/lint/llib-lx86_64.ln		comp-c-lintlib		lint
-./usr/share/ldscripts/elf_i386.x		comp-util-bin
-./usr/share/ldscripts/elf_i386.xbn		comp-util-bin
-./usr/share/ldscripts/elf_i386.xc		comp-util-bin
-./usr/share/ldscripts/elf_i386.xd		comp-util-bin
-./usr/share/ldscripts/elf_i386.xdc		comp-util-bin
-./usr/share/ldscripts/elf_i386.xdw		comp-util-bin
-./usr/share/ldscripts/elf_i386.xn		comp-util-bin
-./usr/share/ldscripts/elf_i386.xr		comp-util-bin
-./usr/share/ldscripts/elf_i386.xs		comp-util-bin
-./usr/share/ldscripts/elf_i386.xsc		comp-util-bin
-./usr/share/ldscripts/elf_i386.xsw		comp-util-bin
-./usr/share/ldscripts/elf_i386.xu		comp-util-bin
-./usr/share/ldscripts/elf_i386.xw		comp-util-bin
-./usr/share/ldscripts/elf_x86_64.x		comp-util-bin
-./usr/share/ldscripts/elf_x86_64.xbn		comp-util-bin
-./usr/share/ldscripts/elf_x86_64.xc		comp-util-bin
-./usr/share/ldscripts/elf_x86_64.xd		comp-util-bin
-./usr/share/ldscripts/elf_x86_64.xdc		comp-util-bin
-./usr/share/ldscripts/elf_x86_64.xdw		comp-util-bin
-./usr/share/ldscripts/elf_x86_64.xn		comp-util-bin
-./usr/share/ldscripts/elf_x86_64.xr		comp-util-bin
-./usr/share/ldscripts/elf_x86_64.xs		comp-util-bin
-./usr/share/ldscripts/elf_x86_64.xsc		comp-util-bin
-./usr/share/ldscripts/elf_x86_64.xsw		comp-util-bin
-./usr/share/ldscripts/elf_x86_64.xu		comp-util-bin
-./usr/share/ldscripts/elf_x86_64.xw		comp-util-bin
-./usr/share/ldscripts/i386nbsd.x		comp-util-bin
-./usr/share/ldscripts/i386nbsd.xbn		comp-util-bin
-./usr/share/ldscripts/i386nbsd.xn		comp-util-bin
-./usr/share/ldscripts/i386nbsd.xr		comp-util-bin
-./usr/share/ldscripts/i386nbsd.xu		comp-util-bin
+./usr/share/ldscripts/elf_i386.x		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_i386.xbn		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_i386.xc		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_i386.xd		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_i386.xdc		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_i386.xdw		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_i386.xn		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_i386.xr		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_i386.xs		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_i386.xsc		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_i386.xsw		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_i386.xu		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_i386.xw		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_x86_64.x		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_x86_64.xbn		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_x86_64.xc		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_x86_64.xd		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_x86_64.xdc		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_x86_64.xdw		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_x86_64.xn		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_x86_64.xr		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_x86_64.xs		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_x86_64.xsc		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_x86_64.xsw		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_x86_64.xu		comp-obsolete	obsolete
+./usr/share/ldscripts/elf_x86_64.xw		comp-obsolete	obsolete
+./usr/share/ldscripts/i386nbsd.x		comp-obsolete	obsolete
+./usr/share/ldscripts/i386nbsd.xbn		comp-obsolete	obsolete
+./usr/share/ldscripts/i386nbsd.xn		comp-obsolete	obsolete
+./usr/share/ldscripts/i386nbsd.xr		comp-obsolete	obsolete
+./usr/share/ldscripts/i386nbsd.xu		comp-obsolete	obsolete
+./usr/share/ldscripts/i386nbsd.xu		comp-obsolete	obsolete
diff --git a/distrib/sets/lists/comp/md.sparc64 b/distrib/sets/lists/comp/md.sparc64
index a4029e6393b0..83f7f54704a5 100644
--- a/distrib/sets/lists/comp/md.sparc64
+++ b/distrib/sets/lists/comp/md.sparc64
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.32 2008/08/22 13:42:19 lukem Exp $
+# $NetBSD: md.sparc64,v 1.33 2008/10/12 23:00:53 mrg Exp $
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/sparc				comp-c-include
 ./usr/include/sparc/_G_config.h			comp-obsolete		obsolete
@@ -136,3 +136,34 @@
 ./usr/libdata/debug/usr/bin/fdformat.debug	comp-util-debug	debug
 ./usr/libdata/debug/usr/sbin/eeprom.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/ofctl.debug	comp-sysutil-debug	debug
+./usr/libdata/ldscripts/elf32_sparc.x		comp-util-bin
+./usr/libdata/ldscripts/elf32_sparc.xbn		comp-util-bin
+./usr/libdata/ldscripts/elf32_sparc.xc		comp-util-bin
+./usr/libdata/ldscripts/elf32_sparc.xd		comp-util-bin
+./usr/libdata/ldscripts/elf32_sparc.xdc		comp-util-bin
+./usr/libdata/ldscripts/elf32_sparc.xdw		comp-util-bin
+./usr/libdata/ldscripts/elf32_sparc.xn		comp-util-bin
+./usr/libdata/ldscripts/elf32_sparc.xr		comp-util-bin
+./usr/libdata/ldscripts/elf32_sparc.xs		comp-util-bin
+./usr/libdata/ldscripts/elf32_sparc.xsc		comp-util-bin
+./usr/libdata/ldscripts/elf32_sparc.xsw		comp-util-bin
+./usr/libdata/ldscripts/elf32_sparc.xu		comp-util-bin
+./usr/libdata/ldscripts/elf32_sparc.xw		comp-util-bin
+./usr/libdata/ldscripts/elf64_sparc.x		comp-util-bin
+./usr/libdata/ldscripts/elf64_sparc.xbn		comp-util-bin
+./usr/libdata/ldscripts/elf64_sparc.xc		comp-util-bin
+./usr/libdata/ldscripts/elf64_sparc.xd		comp-util-bin
+./usr/libdata/ldscripts/elf64_sparc.xdc		comp-util-bin
+./usr/libdata/ldscripts/elf64_sparc.xdw		comp-util-bin
+./usr/libdata/ldscripts/elf64_sparc.xn		comp-util-bin
+./usr/libdata/ldscripts/elf64_sparc.xr		comp-util-bin
+./usr/libdata/ldscripts/elf64_sparc.xs		comp-util-bin
+./usr/libdata/ldscripts/elf64_sparc.xsc		comp-util-bin
+./usr/libdata/ldscripts/elf64_sparc.xsw		comp-util-bin
+./usr/libdata/ldscripts/elf64_sparc.xu		comp-util-bin
+./usr/libdata/ldscripts/elf64_sparc.xw		comp-util-bin
+./usr/libdata/ldscripts/sparcnbsd.x		comp-util-bin
+./usr/libdata/ldscripts/sparcnbsd.xbn		comp-util-bin
+./usr/libdata/ldscripts/sparcnbsd.xn		comp-util-bin
+./usr/libdata/ldscripts/sparcnbsd.xr		comp-util-bin
+./usr/libdata/ldscripts/sparcnbsd.xu		comp-util-bin
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 61b6d43a06d8..7de4fa47d7dd 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1198 2008/10/02 17:54:51 joerg Exp $
+#	$NetBSD: mi,v 1.1199 2008/10/12 23:00:53 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -3429,6 +3429,7 @@
 ./usr/libdata/debug/usr/sbin/ypxfr.debug	comp-nis-debug		yp,debug
 ./usr/libdata/debug/usr/sbin/zdump.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/zic.debug		comp-sysutil-debug	debug
+./usr/libdata/ldscripts/kmodule			comp-util-share
 ./usr/libdata/lint/llib-lFS.ln		-unknown-	lint,xorg
 ./usr/libdata/lint/llib-lGLw.ln		-unknown-	lint,xorg
 ./usr/libdata/lint/llib-lICE.ln		-unknown-	lint,xorg
@@ -3613,7 +3614,7 @@
 ./usr/share/ldscripts/elf64alpha.xr		comp-obsolete		obsolete
 ./usr/share/ldscripts/elf64alpha.xs		comp-obsolete		obsolete
 ./usr/share/ldscripts/elf64alpha.xu		comp-obsolete		obsolete
-./usr/share/ldscripts/kmodule			comp-util-share
+./usr/share/ldscripts/kmodule			comp-obsolete		obsolete
 ./usr/share/ldscripts/m68kelf.x			comp-obsolete		obsolete
 ./usr/share/ldscripts/m68kelf.xbn		comp-obsolete		obsolete
 ./usr/share/ldscripts/m68kelf.xn		comp-obsolete		obsolete
diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile
index 7598d7c9923b..4336e5813c17 100644
--- a/gnu/usr.bin/binutils/ld/Makefile
+++ b/gnu/usr.bin/binutils/ld/Makefile
@@ -1,18 +1,22 @@
-#	$NetBSD: Makefile,v 1.25 2007/12/02 18:10:21 bouyer Exp $
+#	$NetBSD: Makefile,v 1.26 2008/10/12 23:00:53 mrg Exp $
 
 .include <bsd.own.mk>
 
+SUBDIR=		ldscripts
+
 TOP=		${NETBSDSRCDIR}/gnu
 
 .include "${.CURDIR}/../common/Makefile.inc"
 .include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
 
+SCRIPTSDIR=	/usr/libdata
+
 PROG=		ld
 SRCS=		${G_OFILES:.o=.c}
 CPPFLAGS+=	-I${.CURDIR}/arch/${MACHINE_ARCH} \
 		-I${DIST}/ld \
 		-DDEFAULT_EMULATION=\"${G_EMUL}\" \
-		-DSCRIPTDIR=\"/usr/share\" \
+		-DSCRIPTDIR=\"${SCRIPTSDIR}\" \
 		-DTARGET=\"${G_target_alias}\" \
 		-DBINDIR=\"/usr/bin\" \
 		-DTOOLBINDIR=\"/usr/bin\"
@@ -36,9 +40,7 @@ DPADD+=		${IBERTYOBJ}/libiberty.a
 
 TEXINFO=	${G_TEXINFOS}
 INFOFLAGS=	-I${DIST}/ld -I${DIST}/bfd/doc
-.if ${MACHINE_ARCH} == "x86_64"
-FILESDIR=	/usr/share/ldscripts
-.endif
+FILESDIR=	${SCRIPTSDIR}/ldscripts
 
 .PATH: ${DIST}/ld ${DIST}/ld/emulparams \
 	${DIST}/ld/emultempl ${DIST}/ld/scripttempl ldscripts
@@ -80,7 +82,7 @@ e${f}.c: ${DIST}/ld/genscripts.sh ${.CURDIR}/Makefile stringify.sed
 		${G_target_alias} ${G_target_alias} ${G_target_alias} \
 		${G_EMUL} ${LIBDIR} no ${f} "${G_target_alias}"
 
-.if ${MACHINE_ARCH} == "x86_64"
+.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64"
 FILES+=		${f}.x ${f}.xbn ${f}.xn ${f}.xr ${f}.xu
 
 # XXX hack to find out if .xs exists - slow!
@@ -88,11 +90,13 @@ HAS_XS!=	grep '^GENERATE_SHLIB_SCRIPT' ${DIST}/ld/emulparams/${f}.sh || echo
 .if !empty(HAS_XS)
 FILES+= ${f}.xc ${f}.xd ${f}.xdc ${f}.xdw ${f}.xs ${f}.xsc ${f}.xsw ${f}.xw
 .endif
-.endif
+.endif	# x64_64 || sparc64
+
 .endfor
 
 .include <bsd.prog.mk>
 .include <bsd.info.mk>
+.include <bsd.subdir.mk>
 
 # Make sure we use the pre-generated C files
 .l.c .y.c .y.h:
diff --git a/share/ldscripts/Makefile b/gnu/usr.bin/binutils/ld/ldscripts/Makefile
similarity index 55%
rename from share/ldscripts/Makefile
rename to gnu/usr.bin/binutils/ld/ldscripts/Makefile
index 62f1940f6903..403bce2708ff 100644
--- a/share/ldscripts/Makefile
+++ b/gnu/usr.bin/binutils/ld/ldscripts/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2008/05/20 12:17:49 ad Exp $
+#	$NetBSD: Makefile,v 1.1 2008/10/12 23:00:53 mrg Exp $
 
 NOOBJ=	# defined
 
@@ -6,7 +6,7 @@ NOOBJ=	# defined
 
 .if ${MKSHARE} != "no"
 FILES=	kmodule
-FILESDIR=/usr/share/ldscripts
+FILESDIR=/usr/libdata/ldscripts
 .endif
 
 .include <bsd.prog.mk>
diff --git a/share/ldscripts/kmodule b/gnu/usr.bin/binutils/ld/ldscripts/kmodule
similarity index 81%
rename from share/ldscripts/kmodule
rename to gnu/usr.bin/binutils/ld/ldscripts/kmodule
index 99b426dab2c4..8c48e7331b5b 100644
--- a/share/ldscripts/kmodule
+++ b/gnu/usr.bin/binutils/ld/ldscripts/kmodule
@@ -1,4 +1,4 @@
-/*	$NetBSD: kmodule,v 1.1 2008/05/20 12:17:49 ad Exp $	*/
+/*	$NetBSD: kmodule,v 1.1 2008/10/12 23:00:53 mrg Exp $	*/
 
 SECTIONS
 {
diff --git a/share/Makefile b/share/Makefile
index c4b831cf2f3e..1105272f05e8 100644
--- a/share/Makefile
+++ b/share/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.28 2008/05/20 12:17:48 ad Exp $
+#	$NetBSD: Makefile,v 1.29 2008/10/12 23:00:54 mrg Exp $
 #	from @(#)Makefile	8.1 (Berkeley) 6/5/93
 
 # Missing:  ms
@@ -7,7 +7,7 @@
 
 .if ${MKSHARE} != "no" || \
 	make(clean) || make(cleandir) || make(distclean) || make(obj)
-SUBDIR=	atf dict doc examples ldscripts legal man me misc mk \
+SUBDIR=	atf dict doc examples legal man me misc mk \
 	tabset termcap tmac wscons xml xsl zoneinfo
 .if ${MKNLS} != "no"
 SUBDIR+=i18n locale nls
diff --git a/share/mk/bsd.kmodule.mk b/share/mk/bsd.kmodule.mk
index fb497cc4ca58..d4171f80ea8e 100644
--- a/share/mk/bsd.kmodule.mk
+++ b/share/mk/bsd.kmodule.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.kmodule.mk,v 1.11 2008/08/24 06:27:00 gmcgarry Exp $
+#	$NetBSD: bsd.kmodule.mk,v 1.12 2008/10/12 23:00:54 mrg Exp $
 
 .include <bsd.init.mk>
 .include <bsd.klinks.mk>
@@ -24,10 +24,10 @@ _YKMSRCS=	${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}}
 DPSRCS+=	${_YKMSRCS}
 CLEANFILES+=	${_YKMSRCS}
 
-.if exists($S/../share/ldscripts/kmodule)
-KMODSCRIPT=	$S/../share/ldscripts/kmodule
+.if exists($S/../gnu/usr.bin/binutils/ld/ldscripts/kmodule)
+KMODSCRIPT=	$S/../gnu/usr.bin/binutils/ld/ldscripts/kmodule
 .else
-KMODSCRIPT=	${DESTDIR}/usr/share/ldscripts/kmodule
+KMODSCRIPT=	${DESTDIR}/usr/libdata/ldscripts/kmodule
 .endif
 
 OBJS+=		${SRCS:N*.h:N*.sh:R:S/$/.o/g}