diff --git a/Makefile b/Makefile
index ed51cdb..17630ea 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ PROTO_SRC := $(ROOT_DIR)/third_party/grpc/third_party/protobuf/src
 PROTO_LIB := $(PROTO_SRC)/.libs
 PROTOC := $(PROTO_SRC)/protoc
 GRPC_INC := $(ROOT_DIR)/third_party/grpc/include
+GRPC_SRC := $(ROOT_DIR)/third_party/grpc
 GRPC_LIB := $(ROOT_DIR)/third_party/grpc/libs/opt
 
 all: clean package package_static
@@ -41,7 +42,7 @@ nginx_config:
 	--with-http_ssl_module \
 	--with-http_v2_module \
 	--with-cc-opt="-I /usr/local/include -I $(ROOT_DIR) -I $(PROTO_SRC) \
--I $(GRPC_INC)" \
+-I $(GRPC_INC) -I $(GRPC_SRC)" \
 	--with-ld-opt="$(NGINX_LD_OPT)" \
 	--with-openssl="$(ROOT_DIR)/third_party/openssl" \
 	--add-module="$(ROOT_DIR)/net/grpc/gateway/nginx"
@@ -52,7 +53,7 @@ nginx_config_static:
 	--with-http_ssl_module \
 	--with-http_v2_module \
 	--with-cc-opt="-I /usr/local/include -I $(ROOT_DIR) -I $(PROTO_SRC) \
--I $(GRPC_INC)" \
+-I $(GRPC_INC) -I $(GRPC_SRC)" \
 	--with-ld-opt="$(NGINX_STATIC_LD_OPT)" \
 	--with-openssl="$(ROOT_DIR)/third_party/openssl" \
 	--add-module="$(ROOT_DIR)/net/grpc/gateway/nginx"
diff --git a/init_submodules.sh b/init_submodules.sh
index 97d59ff..425d443 100755
--- a/init_submodules.sh
+++ b/init_submodules.sh
@@ -1,4 +1,4 @@
 git submodule update --init
 cd third_party/closure-library && git checkout tags/v20160911 -f && cd ../..
 cd third_party/openssl && git checkout tags/OpenSSL_1_0_2h -f && cd ../..
-cd third_party/grpc && git checkout tags/v1.1.0-pre1 -f && git submodule update --init && cd ../..
+cd third_party/grpc && git checkout master -f && git submodule update --init && cd ../..