diff --git a/3rdparty/libpng/CMakeLists.txt b/3rdparty/libpng/CMakeLists.txt
index 76ead5d1dd..bd243c34a4 100644
--- a/3rdparty/libpng/CMakeLists.txt
+++ b/3rdparty/libpng/CMakeLists.txt
@@ -3,7 +3,7 @@
 #
 # ----------------------------------------------------------------------------
 
-if(NEON)
+if(ARM AND ENABLE_NEON AND NOT AARCH64)
   project(${PNG_LIBRARY} ASM)
 else()
   project(${PNG_LIBRARY})
@@ -14,9 +14,11 @@ ocv_include_directories("${CMAKE_CURRENT_SOURCE_DIR}" ${ZLIB_INCLUDE_DIR})
 file(GLOB lib_srcs *.c)
 file(GLOB lib_hdrs *.h)
 
-if(ARM AND NEON)
+if(ARM AND ENABLE_NEON AND NOT AARCH64)
   list(APPEND lib_srcs arm/filter_neon.S arm/arm_init.c)
-  add_definitions(-DPNG_ARM_NEON)
+  add_definitions(-DPNG_ARM_NEON_OPT=2)
+else()
+  add_definitions(-DPNG_ARM_NEON_OPT=0)
 endif()
 
 # ----------------------------------------------------------------------------------