diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b7deba17..82034977a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,7 @@ set(ly_source_files
   ${ly_src_dir}/compare.cc
   ${ly_src_dir}/compare_common.cc
   ${ly_src_dir}/compare_neon.cc
+  ${ly_src_dir}/compare_neon64.cc
   ${ly_src_dir}/compare_gcc.cc
   ${ly_src_dir}/compare_win.cc
   ${ly_src_dir}/convert.cc
@@ -33,12 +34,14 @@ set(ly_source_files
   ${ly_src_dir}/rotate_common.cc
   ${ly_src_dir}/rotate_mips.cc
   ${ly_src_dir}/rotate_neon.cc
+  ${ly_src_dir}/rotate_neon64.cc
   ${ly_src_dir}/rotate_gcc.cc
   ${ly_src_dir}/rotate_win.cc
   ${ly_src_dir}/row_any.cc
   ${ly_src_dir}/row_common.cc
   ${ly_src_dir}/row_mips.cc
   ${ly_src_dir}/row_neon.cc
+  ${ly_src_dir}/row_neon64.cc
   ${ly_src_dir}/row_gcc.cc
   ${ly_src_dir}/row_win.cc
   ${ly_src_dir}/scale.cc
@@ -47,6 +50,7 @@ set(ly_source_files
   ${ly_src_dir}/scale_common.cc
   ${ly_src_dir}/scale_mips.cc
   ${ly_src_dir}/scale_neon.cc
+  ${ly_src_dir}/scale_neon64.cc
   ${ly_src_dir}/scale_gcc.cc
   ${ly_src_dir}/scale_win.cc
   ${ly_src_dir}/video_common.cc
diff --git a/README.chromium b/README.chromium
index 90920410f..a8bfc228a 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 1505
+Version: 1506
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 180db3bc0..69006a268 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 1505
+#define LIBYUV_VERSION 1506
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/libyuv.gyp b/libyuv.gyp
index 664a51190..3d8cb3595 100644
--- a/libyuv.gyp
+++ b/libyuv.gyp
@@ -33,16 +33,22 @@
        }],
     ],
   },
-  'conditions': [
-    ['build_neon != 0', {
-      'targets': [
-        # The NEON-specific components.
-        {
-          'target_name': 'libyuv_neon',
-          'type': 'static_library',
-          'standalone_static_library': 1,
-          # TODO(noahric): This should remove whatever mfpu is set, not
-          # just vfpv3-d16.
+
+  'targets': [
+    {
+      'target_name': 'libyuv',
+      # Change type to 'shared_library' to build .so or .dll files.
+      'type': 'static_library',
+      'variables': {
+        'optimize': 'max',  # enable O2 and ltcg.
+      },
+      # Allows libyuv.a redistributable library without external dependencies.
+      'standalone_static_library': 1,
+      'conditions': [
+        ['build_neon != 0', {
+          'defines': [
+            'LIBYUV_NEON',
+          ],
           'cflags!': [
             '-mfpu=vfp',
             '-mfpu=vfpv3',
@@ -63,42 +69,7 @@
               ],
             }],
           ],
-          'include_dirs': [
-            'include',
-            '.',
-          ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              'include',
-              '.',
-            ],
-          },
-          'sources': [
-            # sources.
-            'source/compare_neon.cc',
-            'source/compare_neon64.cc',
-            'source/rotate_neon.cc',
-            'source/rotate_neon64.cc',
-            'source/row_neon.cc',
-            'source/row_neon64.cc',
-            'source/scale_neon.cc',
-            'source/scale_neon64.cc',
-          ],
-        },
-      ],
-    }],
-  ],
-  'targets': [
-    {
-      'target_name': 'libyuv',
-      # Change type to 'shared_library' to build .so or .dll files.
-      'type': 'static_library',
-      'variables': {
-        'optimize': 'max',  # enable O2 and ltcg.
-      },
-      # Allows libyuv.a redistributable library without external dependencies.
-      'standalone_static_library': 1,
-      'conditions': [
+        }],
         ['OS != "ios" and libyuv_disable_jpeg != 1', {
           'defines': [
             'HAVE_JPEG'
@@ -123,14 +94,6 @@
             }],
           ],
         }],
-        ['build_neon != 0', {
-          'dependencies': [
-            'libyuv_neon',
-          ],
-          'defines': [
-            'LIBYUV_NEON',
-          ],
-        }],
         # MemorySanitizer does not support assembly code yet.
         # http://crbug.com/344505
         [ 'msan == 1', {
diff --git a/libyuv.gypi b/libyuv.gypi
index ceeab5386..73fdec0a9 100644
--- a/libyuv.gypi
+++ b/libyuv.gypi
@@ -34,6 +34,8 @@
       'source/compare.cc',
       'source/compare_common.cc',
       'source/compare_gcc.cc',
+      'source/compare_neon.cc',
+      'source/compare_neon64.cc',
       'source/compare_win.cc',
       'source/convert.cc',
       'source/convert_argb.cc',
@@ -50,20 +52,26 @@
       'source/rotate_any.cc',
       'source/rotate_argb.cc',
       'source/rotate_common.cc',
-      'source/rotate_mips.cc',
       'source/rotate_gcc.cc',
+      'source/rotate_mips.cc',
+      'source/rotate_neon.cc',
+      'source/rotate_neon64.cc',
       'source/rotate_win.cc',
       'source/row_any.cc',
       'source/row_common.cc',
-      'source/row_mips.cc',
       'source/row_gcc.cc',
+      'source/row_mips.cc',
+      'source/row_neon.cc',
+      'source/row_neon64.cc',
       'source/row_win.cc',
       'source/scale.cc',
-      'source/scale_argb.cc',
       'source/scale_any.cc',
+      'source/scale_argb.cc',
       'source/scale_common.cc',
-      'source/scale_mips.cc',
       'source/scale_gcc.cc',
+      'source/scale_mips.cc',
+      'source/scale_neon.cc',
+      'source/scale_neon64.cc',
       'source/scale_win.cc',
       'source/video_common.cc',
     ],