diff --git a/.gitignore b/.gitignore
index b2da814..85d858c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /nats-streaming-server-0.14.1.tar.gz
 /nats-streaming-server-0.16.2.tar.gz
 /nats-streaming-server-0.17.0.tar.gz
+/nats-streaming-server-0.18.0.tar.gz
diff --git a/golang-github-nats-io-streaming-server.spec b/golang-github-nats-io-streaming-server.spec
index 3ae5930..b81949f 100644
--- a/golang-github-nats-io-streaming-server.spec
+++ b/golang-github-nats-io-streaming-server.spec
@@ -3,7 +3,7 @@
 
 # https://github.com/nats-io/nats-streaming-server
 %global goipath         github.com/nats-io/nats-streaming-server
-Version:                0.17.0
+Version:                0.18.0
 
 %gometa
 
@@ -16,7 +16,7 @@ platform built on NATS.}
                         TODO.md README.md
 
 Name:           %{goname}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        NATS Streaming System Server
 
 # Upstream license specification: Apache-2.0
@@ -27,12 +27,13 @@ Source0:        %{gosource}
 BuildRequires:  golang(github.com/go-sql-driver/mysql)
 BuildRequires:  golang(github.com/gogo/protobuf/gogoproto)
 BuildRequires:  golang(github.com/gogo/protobuf/proto)
+BuildRequires:  golang(github.com/hashicorp/go-hclog)
 BuildRequires:  golang(github.com/hashicorp/go-msgpack/codec)
 BuildRequires:  golang(github.com/hashicorp/raft)
 BuildRequires:  golang(github.com/lib/pq)
-BuildRequires:  golang(github.com/nats-io/nats-server/conf)
-BuildRequires:  golang(github.com/nats-io/nats-server/logger)
-BuildRequires:  golang(github.com/nats-io/nats-server/server)
+BuildRequires:  golang(github.com/nats-io/nats-server/v2/conf)
+BuildRequires:  golang(github.com/nats-io/nats-server/v2/logger)
+BuildRequires:  golang(github.com/nats-io/nats-server/v2/server)
 BuildRequires:  golang(github.com/nats-io/nats.go)
 BuildRequires:  golang(github.com/nats-io/nuid)
 BuildRequires:  golang(github.com/nats-io/stan.go/pb)
@@ -42,7 +43,7 @@ BuildRequires:  golang(golang.org/x/crypto/chacha20poly1305)
 
 %if %{with check}
 # Tests
-BuildRequires:  golang(github.com/nats-io/nats-server/test)
+BuildRequires:  golang(github.com/nats-io/nats-server/v2/test)
 BuildRequires:  golang(github.com/nats-io/stan.go)
 %endif
 
@@ -53,7 +54,6 @@ BuildRequires:  golang(github.com/nats-io/stan.go)
 
 %prep
 %goprep
-sed -i "s|github.com/nats-io/nats-server/v2|github.com/nats-io/nats-server|" $(find . -type f -iname "*.go")
 
 %build
 %gobuild -o %{gobuilddir}/bin/nats-streaming-server %{goipath}
@@ -77,6 +77,9 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
 %gopkgfiles
 
 %changelog
+* Thu Jul 30 07:18:45 CEST 2020 Robert-André Mauchin <zebob.m@gmail.com> - 0.18.0-1
+- Update to 0.18.0
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index 3587067..62fcbaf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nats-streaming-server-0.17.0.tar.gz) = 76866e17fbdb53fefba34dab6763e056e5af813d743884dc993ea36c110d9555c31264b2624933120c3f68a7aa1878a21a7b6820146e9434fbe06d52d24a4b31
+SHA512 (nats-streaming-server-0.18.0.tar.gz) = 86d7fe12b5d810a92970974fa89c717510f6edf81627f512c4b16b41e8abfefdaf374bb9314bf99f04c3a53486a62c7629ac3e0debc021ae1bed87f97c8e91b6