diff --git a/ChangeLog b/ChangeLog
index 769e73819b..f8dacf7781 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-02-07  Rajalakshmi Srinivasaraghavan  <raji@linux.vnet.ibm.com>
+
+	* sysdeps/powerpc/powerpc64/multiarch/strcasestr-power8.S: Redefine
+	STRCHR as __strchr_power8.
+	* sysdeps/powerpc/powerpc64/multiarch/strcat-power8.c: Redefine
+	strlen as __strlen_power8.
+
 2017-02-07  Rajalakshmi Srinivasaraghavan  <raji@linux.vnet.ibm.com>
 
 	* sysdeps/powerpc/powerpc64/power8/strcmp.S: Adjust address for
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasestr-power8.S b/sysdeps/powerpc/powerpc64/multiarch/strcasestr-power8.S
index f188c45f90..5a0eb9cd78 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strcasestr-power8.S
+++ b/sysdeps/powerpc/powerpc64/multiarch/strcasestr-power8.S
@@ -44,6 +44,6 @@
 /* strnlen is used to check if len of r3 is more than r4.  */
 #define STRNLEN __strnlen_power7
 /* strchr is used to check if first char of r4 is present in r3.  */
-#define STRCHR __strchr_power7
+#define STRCHR __strchr_power8
 
 #include <sysdeps/powerpc/powerpc64/power8/strcasestr.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcat-power8.c b/sysdeps/powerpc/powerpc64/multiarch/strcat-power8.c
index d6e69b1940..f138beec67 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strcat-power8.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/strcat-power8.c
@@ -23,8 +23,8 @@
 #define libc_hidden_def(name)
 
 extern typeof (strcpy) __strcpy_power8;
-extern typeof (strlen) __strlen_power7;
+extern typeof (strlen) __strlen_power8;
 
 #define strcpy __strcpy_power8
-#define strlen __strlen_power7
+#define strlen __strlen_power8
 #include <string/strcat.c>