diff --git a/README.chromium b/README.chromium
index c9bf97ec0..340b233fb 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 866
+Version: 869
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 55bed01ad..495eca00c 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 866
+#define LIBYUV_VERSION 869
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/Makefile b/linux.mk
similarity index 85%
rename from Makefile
rename to linux.mk
index ece4a53d7..eb524f8ea 100644
--- a/Makefile
+++ b/linux.mk
@@ -1,6 +1,5 @@
 # This is a generic makefile for libyuv for gcc.
-# Caveat: This file will get overwritten by GYP if projects are generated
-# with GYP_GENERATORS=make
+# make -f linux.mk CC=clang++
 
 CC=g++
 CCFLAGS=-O2 -fomit-frame-pointer -Iinclude/
@@ -34,13 +33,13 @@ LOCAL_OBJ_FILES := \
 .cc.o:
 	$(CC) -c $(CCFLAGS) $*.cc -o $*.o
 
-all: libyuv.a convert Makefile
+all: libyuv.a convert linux.mk
 
-libyuv.a: $(LOCAL_OBJ_FILES) Makefile
+libyuv.a: $(LOCAL_OBJ_FILES) linux.mk
 	$(AR) $(ARFLAGS) -o $@ $(LOCAL_OBJ_FILES)
 
 # A test utility that uses libyuv conversion.
-convert: util/convert.cc Makefile
+convert: util/convert.cc linux.mk
 	$(CC) $(CCFLAGS) -Iutil/ -o $@ util/convert.cc libyuv.a
 
 clean: