diff --git a/README.chromium b/README.chromium
index 7eeb253f8..1145a9abc 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 805
+Version: 806
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/planar_functions.h b/include/libyuv/planar_functions.h
index 7ca6e7fd8..a50a35502 100644
--- a/include/libyuv/planar_functions.h
+++ b/include/libyuv/planar_functions.h
@@ -186,21 +186,6 @@ LIBYUV_API
 int ARGBSepia(uint8* dst_argb, int dst_stride_argb,
               int x, int y, int width, int height);
 
-// Deprecated.  Use ARGBColorMatrix instead.
-// Apply a matrix rotation to each ARGB pixel.
-// matrix_argb is 3 signed ARGB values. -128 to 127 representing -1 to 1.
-// The first 4 coefficients apply to B, G, R, A and produce B of the output.
-// The next 4 coefficients apply to B, G, R, A and produce G of the output.
-// The last 4 coefficients apply to B, G, R, A and produce R of the output.
-LIBYUV_API
-int RGBColorMatrix(uint8* dst_argb, int dst_stride_argb,
-                   const int8* matrix_rgb,
-                   int x, int y, int width, int height);
-
-// Temporary API mapper.
-// #define ARGBColorMatrix(d, s, m, x, y, w, h) \
-//    RGBColorMatrix(d, s, m, x, y, w, h)
-
 // Apply a matrix rotation to each ARGB pixel.
 // matrix_argb is 4 signed ARGB values. -128 to 127 representing -2 to 2.
 // The first 4 coefficients apply to B, G, R, A and produce B of the output.
@@ -213,6 +198,29 @@ int ARGBColorMatrix(const uint8* src_argb, int src_stride_argb,
                     const int8* matrix_argb,
                     int width, int height);
 
+// Deprecated. Use ARGBColorMatrix instead.
+// Apply a matrix rotation to each ARGB pixel.
+// matrix_argb is 3 signed ARGB values. -128 to 127 representing -1 to 1.
+// The first 4 coefficients apply to B, G, R, A and produce B of the output.
+// The next 4 coefficients apply to B, G, R, A and produce G of the output.
+// The last 4 coefficients apply to B, G, R, A and produce R of the output.
+LIBYUV_API
+int RGBColorMatrix(uint8* dst_argb, int dst_stride_argb,
+                   const int8* matrix_rgb,
+                   int x, int y, int width, int height);
+
+#ifdef __cplusplus
+}  // extern "C"
+// Deprecated. Temporary API mapper.
+int inline ARGBColorMatrix(uint8* dst_argb, int dst_stride_argb,
+                           const int8* matrix_rgb,
+                           int x, int y, int width, int height) {
+  return RGBColorMatrix(dst_argb, dst_stride_argb, matrix_rgb,
+                        x, y, width, height);
+}
+extern "C" {
+#endif
+
 // Apply a color table each ARGB pixel.
 // Table contains 256 ARGB values.
 LIBYUV_API
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 92fd1129b..e6e0a629b 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 805
+#define LIBYUV_VERSION 806
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT