diff --git a/ChangeLog b/ChangeLog
index 6a1bd6a873..1ed9f56dce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-27  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/x86_64/multiarch/strlen-no-bsf.S: Move to .text.slow section.
+
+	* sysdeps/x86_64/strlen.S: Minimal code improvement.
+
 2010-08-26  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/x86_64/strlen.S: Unroll the loop.
diff --git a/sysdeps/x86_64/multiarch/strlen-no-bsf.S b/sysdeps/x86_64/multiarch/strlen-no-bsf.S
index 29ad8227b0..3e52f8165c 100644
--- a/sysdeps/x86_64/multiarch/strlen-no-bsf.S
+++ b/sysdeps/x86_64/multiarch/strlen-no-bsf.S
@@ -22,7 +22,7 @@
 
 #include <sysdep.h>
 
-	.text
+	.section .text.slow,"ax",@progbits
 ENTRY (__strlen_no_bsf)
 	xor	%eax, %eax
 	cmpb	$0, (%rdi)