diff --git a/README.chromium b/README.chromium
index 4191aee72..38c14baf8 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 1496
+Version: 1497
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 925617760..ad50070c5 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 1496
+#define LIBYUV_VERSION 1497
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/source/cpu_id.cc b/source/cpu_id.cc
index 088afe92d..28155466a 100644
--- a/source/cpu_id.cc
+++ b/source/cpu_id.cc
@@ -216,9 +216,8 @@ int InitCpuFlags(void) {
               kCpuHasX86;
 
 #ifdef HAS_XGETBV
-  // Avoid call to xgetbv if AVX disabled for drmemory.
-  // TODO(fbarchard): check xsave before calling xgetbv.
-  if ((cpu_info1[2] & 0x18000000) == 0x18000000 &&  // AVX and OSSave
+  // AVX requires CPU has AVX, XSAVE and OSXSave for xgetbv
+  if ((cpu_info1[2] & 0x1c000000) == 0x1c000000 &&  // AVX and OSXSave
       !TestEnv("LIBYUV_DISABLE_AVX") && TestOsSaveYmm()) {  // Saves YMM.
     cpu_info_ |= ((cpu_info7[1] & 0x00000020) ? kCpuHasAVX2 : 0) |
                  kCpuHasAVX;