diff --git a/README.chromium b/README.chromium
index fa207ea3f..4af41b463 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 990
+Version: 994
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 44e1ca6cb..52f2999f1 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 990
+#define LIBYUV_VERSION 994
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/libyuv.gyp b/libyuv.gyp
index 57cd090b6..d067a05dd 100644
--- a/libyuv.gyp
+++ b/libyuv.gyp
@@ -14,7 +14,7 @@
     'use_system_libjpeg%': 0,
     'build_neon': 0,
     'conditions': [
-       [ '(target_arch == "armv7" or target_arch == "armv8" or (target_arch == "arm" and arm_version >= 7)) and (arm_neon == 1 or arm_neon_optional == 1)', {
+       [ '(target_arch == "armv7" or target_arch == "armv7s" or (target_arch == "arm" and arm_version >= 7)) and target_subarch != 64 and (arm_neon == 1 or arm_neon_optional == 1)', {
          'build_neon': 1,
        }],
     ],
@@ -66,6 +66,11 @@
       # Allows libyuv.a redistributable library without external dependencies.
       'standalone_static_library': 1,
       'conditions': [
+        [ 'OS == "ios" and target_subarch == 64', {
+          'defines': [
+            'LIBYUV_DISABLE_NEON'
+          ],
+        }],
         # TODO(fbarchard): Use gyp define to enable jpeg.
         [ 'OS != "ios"', {
           'defines': [
diff --git a/libyuv_test.gyp b/libyuv_test.gyp
index 906fc5f8b..e7e9e76b2 100644
--- a/libyuv_test.gyp
+++ b/libyuv_test.gyp
@@ -51,6 +51,11 @@
             '-fexceptions',
           ],
         }],
+        [ 'OS == "ios" and target_subarch == 64', {
+          'defines': [
+            'LIBYUV_DISABLE_NEON'
+          ],
+        }],
         [ 'OS != "ios"', {
           'defines': [
             'HAVE_JPEG',
@@ -105,6 +110,13 @@
         'util/psnr.cc',
         'util/ssim.cc',
       ],
+      'conditions': [
+        [ 'OS == "ios" and target_subarch == 64', {
+          'defines': [
+            'LIBYUV_DISABLE_NEON'
+          ],
+        }],
+      ], # conditions
     },
     {
       'target_name': 'cpuid',