diff --git a/golang-github-alecthomas-kingpin.spec b/golang-github-alecthomas-kingpin.spec
deleted file mode 100644
index 1dde3dc..0000000
--- a/golang-github-alecthomas-kingpin.spec
+++ /dev/null
@@ -1,71 +0,0 @@
-# https://github.com/alecthomas/kingpin
-%global goipath         gopkg.in/alecthomas/kingpin.v2
-%global forgeurl        https://github.com/alecthomas/kingpin
-Version:                2.2.6
-
-%gometa
-
-Name:           golang-github-alecthomas-kingpin
-Release:        2%{?dist}
-Summary:        A Go command line and flag parser
-# Detected licences
-# - Expat License at 'COPYING'
-License:        MIT
-URL:            %{gourl}
-Source0:        %{gosource}
-
-BuildRequires: golang(github.com/alecthomas/template)
-BuildRequires: golang(github.com/alecthomas/units)
-BuildRequires: golang(github.com/stretchr/testify/assert)
-
-%description
-%{summary}.
-
-
-%package devel
-Summary:       %{summary}
-BuildArch:     noarch
-
-%description devel
-%{summary}.
-
-This package contains library source intended for
-building other packages which use import path with
-%{goipath} prefix.
-
-%prep
-%forgeautosetup
-
-
-%install
-%goinstall
-
-
-%check
-%gochecks
-
-
-%files devel -f devel.file-list
-%license COPYING
-%doc README.md _examples
-
-
-%changelog
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sun Nov 11 2018 Robert-André Mauchin <zebob.m@gmail.com> - 2.2.6-1
-- Release 2.2.6
-- Update to new Go packaging
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.5-3.git1087e65
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.5-2.git1087e65
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Aug  7 2017 mosquito <sensor.wen@gmail.com> - 2.2.5-1
-- Release 2.2.5
-
-* Mon Jan 16 2017 Jaroslav <cz.guardian@gmail.com> Stepanek 2.2.3-1.gite9044be
-- Initial package build
diff --git a/golang-gopkg-alecthomas-kingpin-2.spec b/golang-gopkg-alecthomas-kingpin-2.spec
new file mode 100644
index 0000000..e58739a
--- /dev/null
+++ b/golang-gopkg-alecthomas-kingpin-2.spec
@@ -0,0 +1,73 @@
+# Generated by go2rpm
+%bcond_without check
+
+# https://github.com/alecthomas/kingpin
+%global goipath         gopkg.in/alecthomas/kingpin.v2
+%global forgeurl        https://github.com/alecthomas/kingpin
+Version:                2.2.6
+
+%gometa
+
+%global common_description %{expand:
+Kingpin is a fluent-style, type-safe command-line parser. It supports flags,
+nested commands, and positional arguments.}
+
+%global golicenses      COPYING
+%global godocs          _examples README.md
+
+Name:           %{goname}
+Release:        3%{?dist}
+Summary:        Go command line and flag parser
+
+License:        MIT
+URL:            %{gourl}
+Source0:        %{gosource}
+
+BuildRequires:  golang(github.com/alecthomas/template)
+BuildRequires:  golang(github.com/alecthomas/units)
+
+%if %{with check}
+# Tests
+BuildRequires:  golang(github.com/stretchr/testify/assert)
+%endif
+
+%description
+%{common_description}
+
+%gopkg
+
+%prep
+%goprep
+
+%install
+%gopkginstall
+
+%if %{with check}
+%check
+%gocheck
+%endif
+
+%gopkgfiles
+
+%changelog
+* Sat Apr 20 22:48:28 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 2.2.6-3
+- Update to new macros
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sun Nov 11 2018 Robert-André Mauchin <zebob.m@gmail.com> - 2.2.6-1
+- Release 2.2.6
+- Update to new Go packaging
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.5-3.git1087e65
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.5-2.git1087e65
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Mon Aug  7 2017 mosquito <sensor.wen@gmail.com> - 2.2.5-1
+- Release 2.2.5
+
+* Mon Jan 16 2017 Jaroslav <cz.guardian@gmail.com> Stepanek 2.2.3-1.gite9044be
+- Initial package build