diff --git a/src/system/libroot/posix/glibc/arch/x86/Jamfile b/src/system/libroot/posix/glibc/arch/x86/Jamfile
index 59fa2143a5..4035668300 100644
--- a/src/system/libroot/posix/glibc/arch/x86/Jamfile
+++ b/src/system/libroot/posix/glibc/arch/x86/Jamfile
@@ -112,7 +112,6 @@ MergeObject posix_gnu_arch_$(TARGET_ARCH)_other.o :
 	mplog.c
 	mul_1.S
 	lshift.S rshift.S
-	strlen.S
 	sub_n.S
 	submul_1.S
 ;
diff --git a/src/system/libroot/posix/string/Jamfile b/src/system/libroot/posix/string/Jamfile
index a844ff0f31..9f363f6b73 100644
--- a/src/system/libroot/posix/string/Jamfile
+++ b/src/system/libroot/posix/string/Jamfile
@@ -28,6 +28,7 @@ MergeObject posix_string.o :
 	strerror.c
 	strlcat.c
 	strlcpy.c
+	strlen.cpp
 	strlwr.c
 	strncat.c
 	strncmp.c