diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index fcc915457..7c2f38aa3 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,10 @@
+2015-11-13  Marcus Shawcroft  <marcus.shawcroft@arm.com>
+
+	* libc/machine/arm/Makefile.am: Rename strlen.c to strlen-stub.c
+	* libc/machine/arm/Makefile.in: Regenerate.
+	* libc/machine/arm/strlen.c: Rename to...
+	* libc/machine/arm/strlen-stub.c: ... this.
+
 2015-11-13  Marcus Shawcroft  <marcus.shawcroft@arm.com>
 
 	* libc/machine/arm/Makefile.am: Drop STRLEN_SRC and STRLEN_OBJ.
diff --git a/newlib/libc/machine/arm/Makefile.am b/newlib/libc/machine/arm/Makefile.am
index d920e6ee6..212a3dc64 100644
--- a/newlib/libc/machine/arm/Makefile.am
+++ b/newlib/libc/machine/arm/Makefile.am
@@ -16,7 +16,7 @@ lib_a_SOURCES += memchr-stub.c
 lib_a_SOURCES += memchr.S
 lib_a_SOURCES += memcpy-stub.c
 lib_a_SOURCES += memcpy.S
-lib_a_SOURCES += strlen.c
+lib_a_SOURCES += strlen-stub.c
 
 lib_a_CCASFLAGS=$(AM_CCASFLAGS)
 lib_a_CFLAGS = $(AM_CFLAGS)
diff --git a/newlib/libc/machine/arm/Makefile.in b/newlib/libc/machine/arm/Makefile.in
index 87a3591ae..b43c422a3 100644
--- a/newlib/libc/machine/arm/Makefile.in
+++ b/newlib/libc/machine/arm/Makefile.in
@@ -78,7 +78,7 @@ am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-access.$(OBJEXT) \
 	lib_a-aeabi_memset.$(OBJEXT) lib_a-aeabi_memset-soft.$(OBJEXT) \
 	lib_a-aeabi_memclr.$(OBJEXT) lib_a-memchr-stub.$(OBJEXT) \
 	lib_a-memchr.$(OBJEXT) lib_a-memcpy-stub.$(OBJEXT) \
-	lib_a-memcpy.$(OBJEXT) lib_a-strlen.$(OBJEXT)
+	lib_a-memcpy.$(OBJEXT) lib_a-strlen-stub.$(OBJEXT)
 lib_a_OBJECTS = $(am_lib_a_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp =
@@ -209,7 +209,7 @@ lib_a_SOURCES = setjmp.S access.c strcmp.S strcpy.c strlen-armv7.S \
 	aeabi_memcpy.c aeabi_memcpy-armv7a.S aeabi_memmove.c \
 	aeabi_memmove-soft.S aeabi_memset.c aeabi_memset-soft.S \
 	aeabi_memclr.c memchr-stub.c memchr.S memcpy-stub.c memcpy.S \
-	strlen.c
+	strlen-stub.c
 lib_a_CCASFLAGS = $(AM_CCASFLAGS)
 lib_a_CFLAGS = $(AM_CFLAGS)
 ACLOCAL_AMFLAGS = -I ../../.. -I ../../../..
diff --git a/newlib/libc/machine/arm/strlen.c b/newlib/libc/machine/arm/strlen-stub.c
similarity index 100%
rename from newlib/libc/machine/arm/strlen.c
rename to newlib/libc/machine/arm/strlen-stub.c