diff --git a/ANNOUNCE b/ANNOUNCE
index 5ac48d044..65300119a 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -51,7 +51,10 @@ Version 1.6.2rc03 [April 22, 2013]
   Trivial spelling cleanup.
 
 Version 1.6.2rc04 [April 23, 2013]
-  Revised stack marking in arm/filter_neon.S
+  Revised stack marking in arm/filter_neon.S and configure.ac
+  Ensure that NEON filter stuff is completely disabled when switched 'off'.
+    Previously the ARM NEON specific files were still built if the option
+    was switched 'off' as opposed to being explicitly disabled.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 88426df4b..9ca0491c5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4498,7 +4498,10 @@ Version 1.6.2rc03 [April 22, 2013]
   Trivial spelling cleanup.
 
 Version 1.6.2rc04 [April 23, 2013]
-  Revised stack marking in arm/filter_neon.S
+  Revised stack marking in arm/filter_neon.S and configure.ac
+  Ensure that NEON filter stuff is completely disabled when switched 'off'.
+    Previously the ARM NEON specific files were still built if the option
+    was switched 'off' as opposed to being explicitly disabled.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/configure.ac b/configure.ac
index 79ff2f701..0eb8921bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -240,9 +240,12 @@ AC_ARG_ENABLE([arm-neon],
       [a call to png_set_option; on: turn on unconditionally.  The]
       [default is 'on' if __ARM_NEON__ is defined, otherwise 'off'.]),
    [case "$enableval" in
-      off)
+      no|off)
+         # disable the default enabling on __ARM_NEON__ systems:
          AC_DEFINE([PNG_NO_ARM_NEON], [],
-                   [Disable ARM Neon optimizations]);;
+                   [Disable ARM Neon optimizations])
+         # Prevent use of the assembler files below:
+         enable_arm_neon=no;;
       check)
          AC_DEFINE([PNG_ARM_NEON_CHECK_SUPPORTED], [],
                    [Check for ARM Neon support at run-time]);;