diff --git a/README.chromium b/README.chromium
index 579a4d1ed..1cd2f83cb 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 976
+Version: 977
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index d20f392bf..e19fa79bb 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 976
+#define LIBYUV_VERSION 977
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/linux.mk b/linux.mk
index 5d12135a8..7e2e52d17 100644
--- a/linux.mk
+++ b/linux.mk
@@ -1,8 +1,9 @@
 # This is a generic makefile for libyuv for gcc.
-# make -f linux.mk CC=clang++
+# make -f linux.mk CXX=clang++
 
-CC=g++
-CCFLAGS=-O2 -fomit-frame-pointer -Iinclude/
+CXX?=g++
+CXXFLAGS?=-O2 -fomit-frame-pointer
+CXXFLAGS+=-Iinclude/
 
 LOCAL_OBJ_FILES := \
     source/compare.o           \
@@ -32,16 +33,16 @@ LOCAL_OBJ_FILES := \
     source/video_common.o
 
 .cc.o:
-	$(CC) -c $(CCFLAGS) $*.cc -o $*.o
+	$(CXX) -c $(CXXFLAGS) $*.cc -o $*.o
 
-all: libyuv.a convert linux.mk
+all: libyuv.a convert
 
-libyuv.a: $(LOCAL_OBJ_FILES) linux.mk
+libyuv.a: $(LOCAL_OBJ_FILES)
 	$(AR) $(ARFLAGS) -o $@ $(LOCAL_OBJ_FILES)
 
 # A test utility that uses libyuv conversion.
-convert: util/convert.cc linux.mk
-	$(CC) $(CCFLAGS) -Iutil/ -o $@ util/convert.cc libyuv.a
+convert: util/convert.cc libyuv.a
+	$(CXX) $(CXXFLAGS) -Iutil/ -o $@ util/convert.cc libyuv.a
 
 clean:
 	/bin/rm -f source/*.o *.ii *.s libyuv.a convert