diff --git a/ChangeLog b/ChangeLog
index fd7923be34..8a589aae0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 2009-04-07  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/x86_64/strchrnul.S: New file.
+
 	* crypt/Makefile (LDLIBS-crypt.so): Use this variable instead of
-	depending libcrypt in -lfreebl3.
+	depending libcrypt on -lfreebl3.
 
 	* sysdeps/unix/sysv/linux/kernel-features.h: Power also has
 	preadv/pwritev in 2.6.30.
diff --git a/NEWS b/NEWS
index e969b61b58..c50a66bb43 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes.  2009-4-6
+GNU C Library NEWS -- history of user-visible changes.  2009-4-7
 Copyright (C) 1992-2008, 2009 Free Software Foundation, Inc.
 See the end for copying conditions.
 
@@ -37,7 +37,7 @@ Version 2.10
 
 * New locales: nan_TW@latin, ks_IN
 
-* Faster strlen, strchr, and memchr on x86-64.
+* Faster strlen, strchr, strchrnul, and memchr for x86-64.
   Implemented by Ulrich Drepper.
 
 
diff --git a/sysdeps/x86_64/strchrnul.S b/sysdeps/x86_64/strchrnul.S
new file mode 100644
index 0000000000..ae3aa073eb
--- /dev/null
+++ b/sysdeps/x86_64/strchrnul.S
@@ -0,0 +1,64 @@
+/* strchrnul (str, ch) -- Return pointer to first occurrence of CH in STR
+	or terminating NUL byte.
+   For AMD x86-64.
+   Copyright (C) 2009 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <sysdep.h>
+
+
+	.text
+ENTRY (__strchrnul)
+	movd	%esi, %xmm1
+	movq	%rdi, %rcx
+	punpcklbw %xmm1, %xmm1
+	andq	$~15, %rdi
+	pxor	%xmm2, %xmm2
+	punpcklbw %xmm1, %xmm1
+	orl	$0xffffffff, %esi
+	movdqa	(%rdi), %xmm0
+	pshufd	$0, %xmm1, %xmm1
+	subq	%rdi, %rcx
+	movdqa	%xmm0, %xmm3
+	leaq	16(%rdi), %rdi
+	pcmpeqb	%xmm1, %xmm0
+	pcmpeqb	%xmm2, %xmm3
+	shl	%cl, %esi
+	pmovmskb %xmm0, %edx
+	pmovmskb %xmm3, %ecx
+	andl	%esi, %edx
+	andl	%esi, %ecx
+	orl	%edx, %ecx
+	jnz	1f
+
+2:	movdqa	(%rdi), %xmm0
+	leaq	16(%rdi), %rdi
+	movdqa	%xmm0, %xmm3
+	pcmpeqb	%xmm1, %xmm0
+	pcmpeqb	%xmm2, %xmm3
+	pmovmskb %xmm0, %edx
+	pmovmskb %xmm3, %ecx
+	orl	%edx, %ecx
+	jz	2b
+
+1:	bsfl	%ecx, %edx
+	leaq	-16(%rdi,%rdx), %rax
+	ret
+END (__strchrnul)
+
+weak_alias (__strchrnul, strchrnul)