diff --git a/golang-gopkg-square-jose-2.spec b/golang-gopkg-square-jose-2.spec
index afd996a..355936a 100644
--- a/golang-gopkg-square-jose-2.spec
+++ b/golang-gopkg-square-jose-2.spec
@@ -1,4 +1,4 @@
-# Run tests in check section
+# Generated by go2rpm
 %bcond_without check
 
 # https://github.com/square/go-jose
@@ -6,20 +6,25 @@
 %global forgeurl        https://github.com/square/go-jose
 Version:                2.3.1
 
+%gometa
+
 %global common_description %{expand:
 Package jose aims to provide an implementation of the Javascript Object
 Signing and Encryption set of standards. This includes support for JSON Web
 Encryption, JSON Web Signature, and JSON Web Token standards.}
 
-%gometa
+%global golicenses      LICENSE LICENSE-json
+%global godocs          BUG-BOUNTY.md CONTRIBUTING.md README.md\\\
+                        README-jose-util.md README-json.md README-jwk-keygen.md
 
 Name:           %{goname}
-Release:        1%{?dist}
-Summary:        An implementation of JOSE standards (JWE, JWS, JWT) in Go
-# Detected licences
-# - *No copyright* Apache License (v2.0) at 'LICENSE'
-# json/ is BSD
-License:        ASL 2.0 and BSD
+Release:        2%{?dist}
+Summary:        Implementation of JOSE standards (JWE, JWS, JWT) in Go
+
+# Upstream license specification: BSD-3-Clause and Apache-2.0
+# ASL 2.0:  Main library
+# BSD:      json/
+License:        BSD and ASL 2.0
 URL:            %{gourl}
 Source0:        %{gosource}
 
@@ -36,56 +41,43 @@ BuildRequires:  golang(github.com/stretchr/testify/require)
 %description
 %{common_description}
 
-
-%package devel
-Summary:       %{summary}
-BuildArch:     noarch
-
-%description devel
-%{common_description}
-
-This package contains library source intended for
-building other packages which use import path with
-%{goipath} prefix.
-
+%gopkg
 
 %prep
-%forgeautosetup
-
+%goprep
 mv json/LICENSE LICENSE-json
-
+for d in jose-util json jwk-keygen; do
+mv $d/README.md README-$d.md
+done
 
 %build
-%gobuildroot
-%gobuild -o _bin/jose-util %{goipath}/jose-util
-%gobuild -o _bin/jwk-keygen %{goipath}/jwk-keygen
-
+for cmd in jwk-keygen jose-util; do
+  %gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd
+done
 
 %install
-%goinstall -t jose-util -t jwk-keygen
-install -Dpm 0755 _bin/jose-util %{buildroot}%{_bindir}/jose-util
-install -Dpm 0755 _bin/jwk-keygen %{buildroot}%{_bindir}/jwk-keygen
-
+%gopkginstall
+install -m 0755 -vd                     %{buildroot}%{_bindir}
+install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
 
 %if %{with check}
 %check
-%gochecks
+%gocheck
 %endif
 
-
 %files
 %license LICENSE LICENSE-json
-%{_bindir}/jose-util
-%{_bindir}/jwk-keygen
-
-
-%files devel -f devel.file-list
-%license LICENSE LICENSE-json
-%doc README.md CONTRIBUTING.md BUG-BOUNTY.md
+%doc BUG-BOUNTY.md CONTRIBUTING.md README.md
+%doc README-jose-util.md README-json.md README-jwk-keygen.md
+%{_bindir}/*
 
+%gopkgfiles
 
 %changelog
-* Thu Apr 11 23:27:33 CET 2019 Robert-André Mauchin <zebob.m@gmail.com> - 2.3.1-1
+* Tue Apr 30 16:59:47 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 2.3.1-2
+- Update to new macros
+
+* Thu Apr 11 23:27:33 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 2.3.1-1
 - Release 2.3.1 (#1698660)
 
 * Sun Mar 17 2019 Robert-André Mauchin <zebob.m@gmail.com> - 2.3.0-1
@@ -99,4 +91,3 @@ install -Dpm 0755 _bin/jwk-keygen %{buildroot}%{_bindir}/jwk-keygen
 
 * Wed Nov 14 2018 Robert-André Mauchin <zebob.m@gmail.com> - 2.1.9-1
 - First package for Fedora
-