diff --git a/ANNOUNCE b/ANNOUNCE
index 2e9fb06df..f8c62d3d5 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.7.0beta87 - December 30, 2016
+Libpng 1.7.0beta87 - December 31, 2016
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -1423,7 +1423,8 @@ Version 1.7.0beta86 [December 29, 2016]
   Fixed a potential null pointer dereference in png_set_text_2() (bug report
     and patch by Patrick Keshishian, CVE-2016-10087).
 
-Version 1.7.0beta87 [December 30, 2016]
+Version 1.7.0beta87 [December 31, 2016]
+  Fixed arm/aarch64 detection in CMakeLists.txt (Gianfranco Costamagna).
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 97de009d1..b8551507b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5723,7 +5723,8 @@ Version 1.7.0beta86 [December 29, 2016]
   Fixed a potential null pointer dereference in png_set_text_2() (bug report
     and patch by Patrick Keshishian, CVE-2016-10087).
 
-Version 1.7.0beta87 [December 30, 2016]
+Version 1.7.0beta87 [December 31, 2016]
+  Fixed arm/aarch64 detection in CMakeLists.txt (Gianfranco Costamagna).
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22f3f3d6c..8c4c9d9b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,7 +71,8 @@ set(PNG_PREFIX "" CACHE STRING "Prefix to add to the API function names")
 set(DFA_XTRA "" CACHE FILEPATH "File containing extra configuration settings")
 
 # set definitions and sources for arm
-if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm" OR
+  ${CMAKE_SYSTEM_PROCESSOR} MATCHES "^aarch64")
   set(PNG_ARM_NEON_POSSIBLE_VALUES check on off)
   set(PNG_ARM_NEON "check" CACHE STRING "Enable ARM NEON optimizations:
      check: (default) use internal checking code;