diff --git a/.gitignore b/.gitignore
index 3624859..60967c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/grpc-go-777daa1.tar.gz
+/grpc-go-8050b9c.tar.gz
diff --git a/golang-github-grpc-grpc-go.spec b/golang-github-grpc-grpc-go.spec
index 82459c1..f6584e5 100644
--- a/golang-github-grpc-grpc-go.spec
+++ b/golang-github-grpc-grpc-go.spec
@@ -37,12 +37,12 @@
 # https://github.com/grpc/grpc-go
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     google.golang.org/grpc
-%global commit          777daa17ff9b5daef1cfdf915088a2ada3332bf0
+%global commit          8050b9cbc271307e5a716a9d782803d09b0d6f2d
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 Name:           golang-%{provider}-%{project}-%{repo}
 Version:        1.0.0
-Release:        0.6.git%{shortcommit}%{?dist}
+Release:        0.7.git%{shortcommit}%{?dist}
 Summary:        The Go language implementation of gRPC. HTTP/2 based RPC
 License:        BSD
 URL:            https://%{provider_prefix}
@@ -63,6 +63,7 @@ BuildArch:     noarch
 
 %if 0%{?with_check}
 BuildRequires: golang(github.com/golang/glog)
+BuildRequires: golang(github.com/golang/mock/gomock)
 BuildRequires: golang(github.com/golang/protobuf/proto)
 BuildRequires: golang(github.com/golang/protobuf/protoc-gen-go/descriptor)
 BuildRequires: golang(golang.org/x/net/context)
@@ -75,6 +76,7 @@ BuildRequires: golang(golang.org/x/oauth2/jwt)
 %endif
 
 Requires:      golang(github.com/golang/glog)
+Requires:      golang(github.com/golang/mock/gomock)
 Requires:      golang(github.com/golang/protobuf/proto)
 Requires:      golang(github.com/golang/protobuf/protoc-gen-go/descriptor)
 Requires:      golang(golang.org/x/net/context)
@@ -91,9 +93,10 @@ Provides:      golang(%{import_path}/benchmark/grpc_testing) = %{version}-%{rele
 Provides:      golang(%{import_path}/benchmark/stats) = %{version}-%{release}
 Provides:      golang(%{import_path}/codes) = %{version}-%{release}
 Provides:      golang(%{import_path}/credentials) = %{version}-%{release}
+Provides:      golang(%{import_path}/credentials/oauth) = %{version}-%{release}
 Provides:      golang(%{import_path}/examples/helloworld/helloworld) = %{version}-%{release}
+Provides:      golang(%{import_path}/examples/helloworld/mock/mock_helloworld) = %{version}-%{release}
 Provides:      golang(%{import_path}/examples/route_guide/routeguide) = %{version}-%{release}
-Provides:      golang(%{import_path}/credentials/oauth) = %{version}-%{release}
 Provides:      golang(%{import_path}/grpclb) = %{version}-%{release}
 Provides:      golang(%{import_path}/grpclb/grpc_lb_v1) = %{version}-%{release}
 Provides:      golang(%{import_path}/grpclog) = %{version}-%{release}
@@ -102,13 +105,17 @@ Provides:      golang(%{import_path}/health) = %{version}-%{release}
 Provides:      golang(%{import_path}/health/grpc_health_v1) = %{version}-%{release}
 Provides:      golang(%{import_path}/interop) = %{version}-%{release}
 Provides:      golang(%{import_path}/interop/grpc_testing) = %{version}-%{release}
+Provides:      golang(%{import_path}/keepalive) = %{version}-%{release}
 Provides:      golang(%{import_path}/metadata) = %{version}-%{release}
 Provides:      golang(%{import_path}/naming) = %{version}-%{release}
 Provides:      golang(%{import_path}/peer) = %{version}-%{release}
 Provides:      golang(%{import_path}/reflection) = %{version}-%{release}
 Provides:      golang(%{import_path}/reflection/grpc_reflection_v1alpha) = %{version}-%{release}
 Provides:      golang(%{import_path}/reflection/grpc_testing) = %{version}-%{release}
+Provides:      golang(%{import_path}/stats) = %{version}-%{release}
+Provides:      golang(%{import_path}/stats/grpc_testing) = %{version}-%{release}
 Provides:      golang(%{import_path}/stress/grpc_testing) = %{version}-%{release}
+Provides:      golang(%{import_path}/tap) = %{version}-%{release}
 Provides:      golang(%{import_path}/test/codec_perf) = %{version}-%{release}
 Provides:      golang(%{import_path}/test/grpc_testing) = %{version}-%{release}
 Provides:      golang(%{import_path}/transport) = %{version}-%{release}
@@ -215,6 +222,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
 %endif
 
 %changelog
+* Fri Sep 22 2017 Jan Chaloupka <jchaloup@redhat.com> - 1.0.0-0.7.git8050b9c
+- Bump to upstream 8050b9cbc271307e5a716a9d782803d09b0d6f2d
+  related: #1250461
+
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-0.6.git777daa1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/sources b/sources
index 04b6422..b860c90 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (grpc-go-777daa1.tar.gz) = ca79d38bc7d68f1d98869bee21dcdc563c3fee1a8d28b77d474752376fb91cc7b368466dfac41ddebbec13c1560ac3c22257a52deb6d844add5d208646d2e3f5
+SHA512 (grpc-go-8050b9c.tar.gz) = a7f52c05e60f6c2f31fdd4947f94bee6562f51b27ce23a2e7feeb92160704c8db0c21961cfb2f5a8ad3d66aa7feac2d94fe877752ad72d9a307691260c0dcd8c