diff --git a/README.chromium b/README.chromium
index 474222096..02087dc86 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 1005
+Version: 1006
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/row.h b/include/libyuv/row.h
index 3d3fe1151..7a54e4ad8 100644
--- a/include/libyuv/row.h
+++ b/include/libyuv/row.h
@@ -237,7 +237,8 @@ extern "C" {
 
 // The following are available on Neon platforms:
 #if !defined(LIBYUV_DISABLE_NEON) && \
-    (defined(__ARM_NEON__) || defined(LIBYUV_NEON))
+    (defined(__ARM_NEON__) || defined(LIBYUV_NEON)) && \
+    !defined(__native_client__)
 #define HAS_ABGRTOUVROW_NEON
 #define HAS_ABGRTOYROW_NEON
 #define HAS_ARGB1555TOARGBROW_NEON
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 2d4af9c67..0bfd45eed 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 1005
+#define LIBYUV_VERSION 1006
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/source/compare_neon.cc b/source/compare_neon.cc
index c377c1634..77f42f45c 100644
--- a/source/compare_neon.cc
+++ b/source/compare_neon.cc
@@ -27,7 +27,14 @@ uint32 SumSquareError_NEON(const uint8* src_a, const uint8* src_b, int count) {
 
     ".p2align  2                               \n"
   "1:                                          \n"
+    // TODO(fbarchard): Define a macro for clearing address bits for NaCL.
+#if defined(__native_client__)
+    "bic        %0, #0xc0000000                \n"
+#endif
     "vld1.8     {q0}, [%0]!                    \n"
+#if defined(__native_client__)
+    "bic        %1, #0xc0000000                \n"
+#endif
     "vld1.8     {q1}, [%1]!                    \n"
     "subs       %2, %2, #16                    \n"
     "vsubl.u8   q2, d0, d2                     \n"
diff --git a/source/rotate_neon.cc b/source/rotate_neon.cc
index 15ca33583..7375bab60 100644
--- a/source/rotate_neon.cc
+++ b/source/rotate_neon.cc
@@ -17,7 +17,8 @@ namespace libyuv {
 extern "C" {
 #endif
 
-#if !defined(LIBYUV_DISABLE_NEON) && defined(__ARM_NEON__)
+#if !defined(LIBYUV_DISABLE_NEON) && defined(__ARM_NEON__) && \
+  !defined(__native_client__)
 static uvec8 kVTbl4x4Transpose =
   { 0,  4,  8, 12,  1,  5,  9, 13,  2,  6, 10, 14,  3,  7, 11, 15 };
 
diff --git a/source/row_neon.cc b/source/row_neon.cc
index 580d367b3..4f5158f91 100644
--- a/source/row_neon.cc
+++ b/source/row_neon.cc
@@ -16,7 +16,8 @@ extern "C" {
 #endif
 
 // This module is for GCC Neon
-#if !defined(LIBYUV_DISABLE_NEON) && defined(__ARM_NEON__)
+#if !defined(LIBYUV_DISABLE_NEON) && defined(__ARM_NEON__) && \
+  !defined(__native_client__)
 
 // Read 8 Y, 4 U and 4 V from 422
 #define READYUV422                                                             \
diff --git a/source/scale_neon.cc b/source/scale_neon.cc
index 0dab53293..410364a1b 100644
--- a/source/scale_neon.cc
+++ b/source/scale_neon.cc
@@ -16,7 +16,8 @@ extern "C" {
 #endif
 
 // This module is for GCC Neon.
-#if !defined(LIBYUV_DISABLE_NEON) && defined(__ARM_NEON__)
+#if !defined(LIBYUV_DISABLE_NEON) && defined(__ARM_NEON__) && \
+  !defined(__native_client__)
 
 // NEON downscalers with interpolation.
 // Provided by Fritz Koenig