diff --git a/README.chromium b/README.chromium
index 066c7c91e..dbf6f522f 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 1257
+Version: 1258
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 6c371b523..7a05b94a1 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 1257
+#define LIBYUV_VERSION 1258
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/unit_test/color_test.cc b/unit_test/color_test.cc
index 887327323..3baf33935 100644
--- a/unit_test/color_test.cc
+++ b/unit_test/color_test.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include <math.h>  // For round
+#include <math.h>  // For lrintf
 #include <stdlib.h>
 
 #include "libyuv/convert.h"
diff --git a/unit_test/convert_test.cc b/unit_test/convert_test.cc
index ea198504c..5ac2a2ecd 100644
--- a/unit_test/convert_test.cc
+++ b/unit_test/convert_test.cc
@@ -8,6 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include <math.h>  // For lrintf
 #include <stdlib.h>
 #include <time.h>
 
@@ -1248,7 +1249,7 @@ TEST_F(libyuvTest, TestYToARGB) {
   uint8 expectedg[32];
   for (int i = 0; i < 32; ++i) {
     y[i] = i * 5 + 17;
-    expectedg[i] = round((y[i] - 16) * 1.164);
+    expectedg[i] = lrintf((y[i] - 16) * 1.164);
   }
   uint8 argb[32 * 4];
   YToARGB(y, 0, argb, 0, 32, 1);