diff --git a/golang-github-grpc-ecosystem-middleware.spec b/golang-github-grpc-ecosystem-middleware.spec
index 1b07790..9e0d582 100644
--- a/golang-github-grpc-ecosystem-middleware.spec
+++ b/golang-github-grpc-ecosystem-middleware.spec
@@ -1,12 +1,14 @@
-# Run tests in check section
+# Generated by go2rpm
 %bcond_without check
 
 # https://github.com/grpc-ecosystem/go-grpc-middleware
 %global goipath         github.com/grpc-ecosystem/go-grpc-middleware
 Version:                1.0.0
 
+%gometa
+
 %global common_description %{expand:
-gRPC Go recently acquired support for Interceptors, i.e. middleware that is 
+gRPC Go recently acquired support for Interceptors, i.e. middleware that is
 executed either on the gRPC Server before the request is passed onto the user's
 application logic, or on the gRPC client either around the user call. It is a
 perfect way to implement common patterns: auth, logging, message, validation,
@@ -17,73 +19,64 @@ microservices easily. The purpose of this repository is to act as a go-to point
 for such reusable functionality. It contains some of them itself, but also will
 link to useful external repos.}
 
-%gometa
+%global golicenses      LICENSE
+%global godocs          CONTRIBUTING.md DOC.md README.md
 
 Name:           %{goname}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Golang gRPC Middlewares: interceptor chaining, auth, logging, retries and more
-# Detected licences
-# - *No copyright* Apache License (v2.0) at 'LICENSE'
+# Upstream license specification: Apache-2.0
 License:        ASL 2.0
 URL:            %{gourl}
 Source0:        %{gosource}
 
-BuildRequires: golang(github.com/gogo/protobuf/gogoproto)
-BuildRequires: golang(github.com/golang/protobuf/jsonpb)
-BuildRequires: golang(github.com/golang/protobuf/proto)
-BuildRequires: golang(github.com/opentracing/opentracing-go)
-BuildRequires: golang(github.com/opentracing/opentracing-go/ext)
-BuildRequires: golang(github.com/opentracing/opentracing-go/log)
-BuildRequires: golang(github.com/sirupsen/logrus)
-BuildRequires: golang(github.com/stretchr/testify/require)
-BuildRequires: golang(github.com/stretchr/testify/suite)
-BuildRequires: golang(go.uber.org/zap)
-BuildRequires: golang(go.uber.org/zap/zapcore)
-BuildRequires: golang(golang.org/x/net/context)
-BuildRequires: golang(golang.org/x/net/trace)
-BuildRequires: golang(google.golang.org/grpc)
-BuildRequires: golang(google.golang.org/grpc/codes)
-BuildRequires: golang(google.golang.org/grpc/credentials)
-BuildRequires: golang(google.golang.org/grpc/grpclog)
-BuildRequires: golang(google.golang.org/grpc/metadata)
-BuildRequires: golang(google.golang.org/grpc/peer)
+BuildRequires:  golang(github.com/gogo/protobuf/gogoproto)
+BuildRequires:  golang(github.com/golang/protobuf/jsonpb)
+BuildRequires:  golang(github.com/golang/protobuf/proto)
+BuildRequires:  golang(github.com/opentracing/opentracing-go)
+BuildRequires:  golang(github.com/opentracing/opentracing-go/ext)
+BuildRequires:  golang(github.com/opentracing/opentracing-go/log)
+BuildRequires:  golang(github.com/sirupsen/logrus)
+BuildRequires:  golang(github.com/stretchr/testify/require)
+BuildRequires:  golang(github.com/stretchr/testify/suite)
+BuildRequires:  golang(go.uber.org/zap)
+BuildRequires:  golang(go.uber.org/zap/zapcore)
+BuildRequires:  golang(golang.org/x/net/context)
+BuildRequires:  golang(golang.org/x/net/trace)
+BuildRequires:  golang(google.golang.org/grpc)
+BuildRequires:  golang(google.golang.org/grpc/codes)
+BuildRequires:  golang(google.golang.org/grpc/credentials)
+BuildRequires:  golang(google.golang.org/grpc/grpclog)
+BuildRequires:  golang(google.golang.org/grpc/internal/transport)
+BuildRequires:  golang(google.golang.org/grpc/metadata)
+BuildRequires:  golang(google.golang.org/grpc/peer)
 
-%description
-%{common_description}
-
-
-%package devel
-Summary:       %{summary}
-BuildArch:     noarch
+%if %{with check}
+# Tests
+BuildRequires:  golang(github.com/stretchr/testify/assert)
+%endif
 
-%description devel
+%description
 %{common_description}
 
-This package contains library source intended for
-building other packages which use import path with
-%{goipath} prefix.
-
+%gopkg
 
 %prep
-%forgeautosetup
-
+%goprep
 
 %install
-%goinstall
-
+%gopkginstall
 
 %if %{with check}
 %check
-%gochecks
+%gocheck
 %endif
 
-
-%files devel -f devel.file-list
-%license LICENSE
-%doc README.md CONTRIBUTING.md DOC.md
-
+%gopkgfiles
 
 %changelog
+* Fri Apr 26 21:06:10 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 1.0.0-2
+- Update to new macros
+
 * Thu Mar 14 2019 Robert-André Mauchin <zebob.m@gmail.com> - 1.0.0-1
 - First package for Fedora
-