diff --git a/ChangeLog b/ChangeLog
index 160777ad65..fc86116912 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-01   H.J. Lu  <hongjiu.lu@intel.com>
+
+	* benchtests/bench-memset.c (do_test): Support 64-byte
+	alignment.
+	(test_main): Test 64-byte alignment.
+
 2016-04-01   H.J. Lu  <hongjiu.lu@intel.com>
 
 	* benchtests/bench-memmove.c (test_main): Test 64-byte
diff --git a/benchtests/bench-memset.c b/benchtests/bench-memset.c
index 6d3218a122..98ec257b3e 100644
--- a/benchtests/bench-memset.c
+++ b/benchtests/bench-memset.c
@@ -134,7 +134,7 @@ do_one_test (impl_t *impl, CHAR *s, int c __attribute ((unused)), size_t n)
 static void
 do_test (size_t align, int c, size_t len)
 {
-  align &= 7;
+  align &= 63;
   if ((align + len) * sizeof (CHAR) > page_size)
     return;
 
@@ -181,6 +181,11 @@ test_main (void)
       do_test (4, c, 64);
       do_test (2, c, 25);
     }
+  for (i = 33; i <= 256; i += 4)
+    {
+      do_test (0, c, 32 * i);
+      do_test (i, c, 32 * i);
+    }
 
   return ret;
 }