diff --git a/README.chromium b/README.chromium
index 550e36047..64d025562 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 586
+Version: 587
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 8fa10f5ac..d4755a768 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 586
+#define LIBYUV_VERSION 587
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/libyuv.gyp b/libyuv.gyp
index c3a530497..d8994e535 100644
--- a/libyuv.gyp
+++ b/libyuv.gyp
@@ -30,12 +30,12 @@
       ],
       'defines': [
         'HAVE_JPEG',
-	# Enable the following 3 macros to turn off assembly for specified CPU.
+        # Enable the following 3 macros to turn off assembly for specified CPU.
         # 'LIBYUV_DISABLE_X86',
         # 'LIBYUV_DISABLE_NEON',
         # 'LIBYUV_DISABLE_MIPS',
-	# Enable the following macro to build libyuv as a shared library (dll).
-        # 'LIBYUV_BUILDING_SHARED_LIBRARY',
+        # Enable the following macro to build libyuv as a shared library (dll).
+        # 'LIBYUV_USING_SHARED_LIBRARY',
       ],
       'include_dirs': [
         'include',
diff --git a/libyuv_test.gyp b/libyuv_test.gyp
index 9db22138f..a31d3a9bc 100644
--- a/libyuv_test.gyp
+++ b/libyuv_test.gyp
@@ -19,11 +19,11 @@
       ],
       'defines': [
         'LIBYUV_SVNREVISION="<!(svnversion -n)"',
-	# Enable the following 3 macros to turn off assembly for specified CPU.
+        # Enable the following 3 macros to turn off assembly for specified CPU.
         # 'LIBYUV_DISABLE_X86',
         # 'LIBYUV_DISABLE_NEON',
         # 'LIBYUV_DISABLE_MIPS',
-	# Enable the following macro to build libyuv as a shared library (dll).
+        # Enable the following macro to build libyuv as a shared library (dll).
         # 'LIBYUV_USING_SHARED_LIBRARY',
       ],
       'sources': [
diff --git a/source/scale.cc b/source/scale.cc
index a146580a9..1d9b21e9a 100644
--- a/source/scale.cc
+++ b/source/scale.cc
@@ -1951,7 +1951,6 @@ static void ScaleAddRows_SSE2(const uint8* src_ptr, ptrdiff_t src_stride,
 static void ScaleFilterRows_SSE2(uint8* dst_ptr,
                                  const uint8* src_ptr, ptrdiff_t src_stride,
                                  int dst_width, int source_y_fraction) {
-  asm volatile (
   asm volatile (
     "sub       %1,%0                           \n"
     "shr       %3                              \n"