diff --git a/ChangeLog b/ChangeLog
index f8652231de..03bba82de7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-10  Richard Earnshaw  <rearnsha@arm.com>
+
+	* sysdeps/aarch64/strchrnul.S (vrepmask): Use a call-clobbered
+	register.
+
 2014-12-10  Joseph Myers  <joseph@codesourcery.com>
 
 	* configure.ac (--disable-werror): New configure option.
diff --git a/sysdeps/aarch64/strchrnul.S b/sysdeps/aarch64/strchrnul.S
index b98c2e951b..57835d88d6 100644
--- a/sysdeps/aarch64/strchrnul.S
+++ b/sysdeps/aarch64/strchrnul.S
@@ -46,7 +46,7 @@
 #define vhas_nul2	v4
 #define vhas_chr1	v5
 #define vhas_chr2	v6
-#define vrepmask	v15
+#define vrepmask	v7
 #define vend1		v16
 
 /* Core algorithm.