diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile
index 56905d36e8c5..4a11cdb6c969 100644
--- a/lib/libthr/Makefile
+++ b/lib/libthr/Makefile
@@ -27,7 +27,7 @@ CFLAGS+=-I${SRCTOP}/lib/libthread_db
 CFLAGS+=-Winline
 
 CFLAGS.thr_stack.c+=	-Wno-cast-align
-CFLAGS.malloc.c+=	-Wno-cast-align
+CFLAGS.rtld_malloc.c+=	-Wno-cast-align
 .include <bsd.compiler.mk>
 .if !(${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} < 40300)
 CFLAGS.thr_symbols.c+=	-Wno-missing-variable-declarations
@@ -58,7 +58,7 @@ PRECIOUSLIB=
 .endif
 .include "${.CURDIR}/sys/Makefile.inc"
 .include "${.CURDIR}/thread/Makefile.inc"
-SRCS+= malloc.c
+SRCS+= rtld_malloc.c
 
 .if ${MK_INSTALLLIB} != "no"
 SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index b0f02a7205e8..71b75b9273b3 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -14,9 +14,17 @@ PROG?=		ld-elf.so.1
 .if (${PROG:M*ld-elf32*} != "")
 TAGS+=		lib32
 .endif
-SRCS=		rtld_start.S \
-		reloc.c rtld.c rtld_lock.c rtld_printf.c map_object.c \
-		malloc.c xmalloc.c debug.c libmap.c
+SRCS= \
+	rtld_start.S \
+	reloc.c \
+	rtld.c \
+	rtld_lock.c \
+	rtld_malloc.c \
+	rtld_printf.c \
+	map_object.c \
+	xmalloc.c \
+	debug.c \
+	libmap.c
 MAN=		rtld.1
 CSTD?=		gnu99
 CFLAGS+=	-Wall -DFREEBSD_ELF -DIN_RTLD -ffreestanding
diff --git a/libexec/rtld-elf/malloc.c b/libexec/rtld-elf/rtld_malloc.c
similarity index 100%
rename from libexec/rtld-elf/malloc.c
rename to libexec/rtld-elf/rtld_malloc.c