diff --git a/.gitignore b/.gitignore
index 7ab2cd9..ac16fde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /grpc-go-1.10.0.tar.gz
+/grpc-go-1.18.0.tar.gz
diff --git a/golang-github-grpc-grpc-go.spec b/golang-github-grpc-grpc-go.spec
index 3b67bf1..3b575e2 100644
--- a/golang-github-grpc-grpc-go.spec
+++ b/golang-github-grpc-grpc-go.spec
@@ -1,20 +1,24 @@
+# Bootstrap needed to avoid circular dep
+%bcond_without bootstrap
+# Run tests in check
+# Disabled for bootstrapping
+%bcond_with check
+
 # http://github.com/grpc/grpc-go
 %global forgeurl        https://github.com/grpc/grpc-go
 %global goipath         google.golang.org/grpc
-%global commit         8e4536a86ab602859c20df5ebfd0bd4228d08655
-
-Version:        1.10.0
+Version:                1.18.0
 
 %gometa
 
 Name:           golang-github-grpc-grpc-go
-Release:        5%{?dist}
+Release:        1%{?dist}
 Summary:        The Go language implementation of gRPC. HTTP/2 based RPC
 License:        BSD
 URL:            %{gourl}
 Source0:        %{gosource}
 Source1:        glide.yaml
-Source2:        glide.yaml
+Source2:        glide.lock
 
 %description
 %{summary}
@@ -25,17 +29,19 @@ BuildArch:     noarch
 
 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(github.com/golang/protobuf/ptypes)
 BuildRequires: golang(golang.org/x/net/context)
 BuildRequires: golang(golang.org/x/net/http2)
 BuildRequires: golang(golang.org/x/net/http2/hpack)
 BuildRequires: golang(golang.org/x/net/trace)
+%if %{without bootstrap}
+BuildRequires: golang(github.com/golang/protobuf/proto)
+BuildRequires: golang(github.com/golang/protobuf/protoc-gen-go/descriptor)
+BuildRequires: golang(github.com/golang/protobuf/ptypes)
 BuildRequires: golang(golang.org/x/oauth2)
 BuildRequires: golang(golang.org/x/oauth2/google)
 BuildRequires: golang(golang.org/x/oauth2/jwt)
 BuildRequires: golang(google.golang.org/genproto/googleapis/rpc/status)
+%endif
 
 %description devel
 %{summary}
@@ -47,6 +53,13 @@ building other packages which use import path with
 %prep
 %forgesetup
 
+%if %{with bootstrap}
+rm encoding/proto/proto.go
+grep --include=\*.go -lrnw . -e "github\.com\/golang\/protobuf" | xargs rm
+grep --include=\*.go -lrnw . -e "golang\.org\/x\/oauth2" | xargs rm
+grep --include=\*.go -lrnw . -e "google\.golang\.org\/genproto" | xargs rm
+%endif
+
 %install
 %goinstall glide.lock glide.yaml
 
@@ -61,11 +74,13 @@ building other packages which use import path with
 %doc README.md CONTRIBUTING.md
 
 %changelog
+* Mon Feb 25 2019 Robert-André Mauchin <zebob.m@gmail.com> - 1.18.0-1
+- Update to release v1.18.0
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-5.git8e4536a
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
-* Tue Oct 23 2018 Nicolas Mailhot <nim@fedoraproject.org>
-- 1.10.0-4
+* Tue Oct 23 2018 Nicolas Mailhot <nim@fedoraproject.org> - 1.10.0-4
 - redhat-rpm-config-123 triggers bugs in gosetup, remove it from Go spec files as it’s just an alias
 - https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/RWD5YATAYAFWKIDZBB7EB6N5DAO4ZKFM/
 
@@ -158,3 +173,4 @@ building other packages which use import path with
 - First package for Fedora
   resolves: #1246205
 
+internal/transport/http_util.go
diff --git a/sources b/sources
index 81f9683..56d960e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (grpc-go-1.10.0.tar.gz) = b612b363ab46e5c8f09aa6be7f3e239d0aa3186d7c0e09c7ee5466afc222382201d814ca0b8d82e803d6d26756170e8da03358e7601cc4c973b0579d093a7a31
+SHA512 (grpc-go-1.18.0.tar.gz) = ce2a15c69af02eeda171bdc9f088eb966a972f874ffb37f126285a2c882041a5898ce1e78f647a9aa80f80fbf6409880923e2ebc6f0148b075a396e5bd27572a