diff --git a/string/test-memcmp.c b/string/test-memcmp.c
index b30e34d..31e1c1f 100644
--- a/string/test-memcmp.c
+++ b/string/test-memcmp.c
@@ -448,6 +448,37 @@ check1 (void)
     }
 }
 
+/* This test checks that memcmp doesn't overrun buffers.  */
+static void
+check2 (void)
+{
+  int max_length = BUF1PAGES * page_size / sizeof (CHAR);
+
+  char * buf = (char *) malloc (sizeof (char) * max_length);
+  /* Initialize buf to the same values as buf1.  */
+  memset (buf, 0xa5, max_length);
+  /* The bug requires the last compared byte to be different.  */
+  buf[max_length - 1]  = 0x5a;
+
+  int length;
+
+  for (length = 1; length < max_length; length++)
+    {
+      char * s1 = (char *) buf1 + max_length - length;
+      char * s2 = buf + max_length - length;
+
+      const int exp_result = SIMPLE_MEMCMP (s1, s2, length);
+
+      FOR_EACH_IMPL (impl, 0)
+	{
+	  printf ("check2: length=%d, %s\n", length, impl->name);
+	  check_result (impl, s1, s2, length, exp_result);
+	}
+    }
+
+  free(buf);
+}
+
 int
 test_main (void)
 {
@@ -456,6 +487,7 @@ test_main (void)
   test_init ();
 
   check1 ();
+  check2 ();
 
   printf ("%23s", "");
   FOR_EACH_IMPL (impl, 0)
diff --git a/sysdeps/x86_64/multiarch/memcmp-ssse3.S b/sysdeps/x86_64/multiarch/memcmp-ssse3.S
index bdd2ed2..e319df9 100644
--- a/sysdeps/x86_64/multiarch/memcmp-ssse3.S
+++ b/sysdeps/x86_64/multiarch/memcmp-ssse3.S
@@ -1463,10 +1463,8 @@ L(next_24_bytes):
 	test	$0x40, %dh
 	jnz	L(Byte22)
 
-	mov	-9(%rdi), %eax
-	and	$0xff, %eax
-	mov	-9(%rsi), %edx
-	and	$0xff, %edx
+	movzbl	-9(%rdi), %eax
+	movzbl	-9(%rsi), %edx
 	sub	%edx, %eax
 	ret
 # else