diff --git a/stand/uboot/Makefile b/stand/uboot/Makefile
index 4405f09408bf..ccd02c44957f 100644
--- a/stand/uboot/Makefile
+++ b/stand/uboot/Makefile
@@ -1,83 +1,83 @@
 
 LOADER_UFS_SUPPORT?=	yes
 LOADER_CD9660_SUPPORT?=	no
 LOADER_MSDOS_SUPPORT?=	no
 LOADER_EXT2FS_SUPPORT?=	no
 LOADER_NET_SUPPORT?=	yes
 LOADER_NFS_SUPPORT?=	yes
 LOADER_TFTP_SUPPORT?=	no
 LOADER_GZIP_SUPPORT?=	no
 LOADER_BZIP2_SUPPORT?=	no
 LOADER_DISK_SUPPORT?=	yes
 
 .include <bsd.init.mk>
 
 .include "${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc"
 
 LOADER_UBLDR_BIN?=	yes
 .if ${LOADER_UBLDR_BIN} != "no"
 FILES+=		ubldr ubldr.bin
 .else
 PROG=		ubldr
 .endif
 
 NEWVERSWHAT=	"U-Boot loader" ${MACHINE_ARCH}
 BINDIR= 	/boot/uboot
 INSTALLFLAGS=	-b
 WARNS?=		1
 
 .PATH:		${BOOTSRC}/common
 .PATH:		${.CURDIR}/arch/${MACHINE_CPUARCH}
 
 
 .if ${COMPILER_TYPE} == "gcc"
 CWARNFLAGS.self_reloc.c+=	-Wno-error=maybe-uninitialized
 .endif
 
 HELP_FILES=	${.CURDIR}/help.uboot ${BOOTSRC}/fdt/help.fdt
 HELP_FILENAME=	loader.help.uboot
 
 # Always add MI sources
 .include	"${BOOTSRC}/loader.mk"
 
-LDSCRIPT=	${.CURDIR}/arch/${MACHINE_CPUARCH}/ldscript.${MACHINE_CPUARCH}
+LDSCRIPT=	${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH}.ldscript
 LDFLAGS=	-nostdlib -static -T ${LDSCRIPT}
 LDFLAGS+=	-Wl,-znotext
 
 SRCS+=		main.c vers.c
 SRCS+=		copy.c devicename.c elf_freebsd.c glue.c
 SRCS+=		net.c reboot.c time.c
 SRCS+=		uboot_console.c uboot_disk.c uboot_fdt.c uboot_module.c
 
 CFLAGS.glue.c+=	-DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib
 
 CFLAGS+=	-I${BOOTSRC}/common
 CFLAGS+=	-I${.CURDIR}
 CFLAGS+=	-I${.OBJDIR}
 
 .if ${MACHINE_CPUARCH} == "arm"
 SRCS+=	metadata.c
 .endif
 
 .include "${BOOTSRC}/fdt.mk"
 
 # Pick up the bootstrap header for some interface items
 CFLAGS+=	-I${LDRSRC}
 
 # libfdt headers
 CFLAGS+=	-I${FDTSRC}
 
 .ifdef(BOOT_DISK_DEBUG)
 # Make the disk code more talkative
 CFLAGS+= -DDISK_DEBUG
 .endif
 
 .if ${LOADER_UBLDR_BIN} != "no"
 OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}
 ubldr ubldr.bin ubldr.pie: ${OBJS}
 .endif
 
 DPADD=		${LDR_INTERP} ${LIBSAFDT} ${LIBSA}
 LDADD=		${LDR_INTERP} ${LIBSAFDT} ${LIBSA}
 
 .include <bsd.prog.mk>
diff --git a/stand/uboot/arch/arm/Makefile.inc b/stand/uboot/arch/arm/Makefile.inc
index 66cb3f1b4dda..115f48672b18 100644
--- a/stand/uboot/arch/arm/Makefile.inc
+++ b/stand/uboot/arch/arm/Makefile.inc
@@ -1,25 +1,25 @@
 # Address at which ubldr will be loaded.
 # This varies for different boards and SOCs.
 UBLDR_LOADADDR?=	0x1000000
 
 SRCS+=		start.S conf.c self_reloc.c 
 
-ldscript.abs:
+abs.ldscript:
 	echo "UBLDR_LOADADDR = ${UBLDR_LOADADDR};" >${.TARGET}
 
-ldscript.pie:
+pie.ldscript:
 	echo "UBLDR_LOADADDR = 0;" >${.TARGET}
 
-ubldr: ${OBJS} ldscript.abs ${LDSCRIPT} ${DPADD}
-	${CC} ${CFLAGS} -T ldscript.abs ${LDFLAGS} \
+ubldr: ${OBJS} abs.ldscript ${LDSCRIPT} ${DPADD}
+	${CC} ${CFLAGS} -T abs.ldscript ${LDFLAGS} \
 	    -o ${.TARGET} ${OBJS} ${LDADD}
 
-ubldr.pie: ${OBJS} ldscript.pie ${LDSCRIPT} ${DPADD}
-	${CC} ${CFLAGS} -T ldscript.pie ${LDFLAGS} -pie -Wl,-Bsymbolic \
+ubldr.pie: ${OBJS} pie.ldscript ${LDSCRIPT} ${DPADD}
+	${CC} ${CFLAGS} -T pie.ldscript ${LDFLAGS} -pie -Wl,-Bsymbolic \
 	    -o ${.TARGET} ${OBJS} ${LDADD}
 
 ubldr.bin: ubldr.pie
 	${OBJCOPY} -S -O binary ubldr.pie ${.TARGET}
 
-CLEANFILES+=	ldscript.abs ldscript.pie ubldr ubldr.pie ubldr.bin
+CLEANFILES+=	abs.ldscript pie.ldscript ubldr ubldr.pie ubldr.bin
 
diff --git a/stand/uboot/arch/arm/ldscript.arm b/stand/uboot/arch/arm/arm.ldscript
similarity index 100%
rename from stand/uboot/arch/arm/ldscript.arm
rename to stand/uboot/arch/arm/arm.ldscript
diff --git a/stand/uboot/arch/powerpc/ldscript.powerpc b/stand/uboot/arch/powerpc/powerpc.ldscript
similarity index 100%
rename from stand/uboot/arch/powerpc/ldscript.powerpc
rename to stand/uboot/arch/powerpc/powerpc.ldscript