diff --git a/.gitignore b/.gitignore
index 2adb01d..c7d09f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /tomb-dd63297.tar.gz
 /tomb-d5d1b58.tar.gz
+/tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz
+/tomb-dd632973f1e7218eb1089048e0798ec9ae7dceb8.tar.gz
diff --git a/golang-github-go-tomb-tomb.spec b/golang-github-go-tomb-tomb.spec
index 65de833..ad75a5c 100644
--- a/golang-github-go-tomb-tomb.spec
+++ b/golang-github-go-tomb-tomb.spec
@@ -1,219 +1,108 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-%global with_check 1
-%global with_unit_test 1
-%else
-%global with_devel 0
-%global with_bundled 0
-%global with_debug 0
-%global with_check 0
-%global with_unit_test 0
-%endif
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package   %{nil}
-%endif
-
-%global provider        github
-%global provider_tld    com
-%global project         go-tomb
-%global repo            tomb
-# https://github.com/go-tomb/tomb
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path     gopkg.in/tomb.v2
+%global goipath         github.com/go-tomb/tomb
 %global commit          d5d1b5820637886def9eef33e03a27a9f166942c
-%global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
-%global import_path_sec gopkg.in/v2/tomb
+%global import_path     gopkg.in/v2/tomb
+%global import_path_sec gopkg.in/tomb.v2
 
 %global v1_commit          dd632973f1e7218eb1089048e0798ec9ae7dceb8
 %global v1_shortcommit     %(c=%{v1_commit}; echo ${c:0:7})
-%global v1_provider_prefix github.com/go-tomb/tomb
-%global v1_import_path     gopkg.in/tomb.v1
-%global v1_import_path_sec gopkg.in/v1/tomb
-%global v1_name            golang-gopkg-tomb-v1
+%global v1_import_path     gopkg.in/v1/tomb
+%global v1_import_path_sec gopkg.in/tomb.v1
 
+%global devel_main      golang-gopkg-tomb-devel-v2
 
-Name:           golang-%{provider}-%{project}-%{repo}
+%gometa
+
+Name:           golang-github-go-tomb-tomb
 Version:        0
-Release:        0.13.git%{shortcommit}%{?dist}
-Summary:        Helps with clean goroutine termination in the Go language
+Release:        15%{?dist}
+Summary:        The tomb package helps with clean goroutine termination in the Go language
 License:        BSD
-URL:            https://%{provider_prefix}
-Source0:        https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-Source1:        https://%{v1_provider_prefix}/archive/%{v1_commit}/%{repo}-%{v1_shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch:  %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+URL:            %{gourl}
+Source0:        %{gosource}
+Source1:        https://%{goipath}/archive/%{v1_commit}/tomb-%{v1_commit}.tar.gz
 
 %description
-%{summary}
+%{summary}.
 
-%if 0%{?with_devel}
 %package devel
-Summary:       %{summary}
-BuildArch:     noarch
-
-%if 0%{?with_check}
-BuildRequires: golang(golang.org/x/net/context)
-%endif
+Summary:        Enables Go programs to comfortably encode and decode YAML values
+BuildArch:      noarch
 
-Requires: golang(golang.org/x/net/context)
-
-Provides:      golang(%{import_path}) = %{version}-%{release}
-Provides:      golang(%{import_path_sec}) = %{version}-%{release}
+BuildRequires:  golang(gopkg.in/check.v1)
+Requires:       golang(gopkg.in/check.v1)
 
 %description devel
-%{summary}
+%{summary}.
 
 This package contains library source intended for
 building other packages which use import path with
-%{import_path} prefix.
-
-%package -n %{v1_name}-devel
-Summary:       %{summary}
-BuildArch:     noarch
-
-%if 0%{?with_check}
-%endif
+%{v1_import_path} prefix.
 
-Provides:      golang(%{v1_import_path}) = %{version}-%{release}
-Provides:      golang(%{v1_import_path_sec}) = %{version}-%{release}
+%package devel-v2
+Summary:        Enables Go programs to comfortably encode and decode YAML values
+BuildArch:      noarch
 
-%description -n %{v1_name}-devel
-%{summary}
+%description devel-v2
+%{summary}.
 
 This package contains library source intended for
 building other packages which use import path with
-%{v1_import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test
-Summary:         Unit tests for %{name} package
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires:        %{name}-devel = %{version}-%{release}
-
-%description unit-test
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{goipath} prefix.
 
 %prep
-%setup -q -n %{repo}-%{v1_commit} -T -b 1
-%setup -q -n %{repo}-%{commit}
-
-%build
+%setup -q -n tomb-%{v1_commit} -T -b 1
+%forgesetup
 
 %install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-install -d -p %{buildroot}/%{gopath}/src/%{import_path_sec}/
-echo "%%dir %%{gopath}/src/%%{import_path_sec}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
-    echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
-    install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
-    cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
-    echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-    echo "%%dir %%{gopath}/src/%%{import_path_sec}/$(dirname $file)" >> devel.file-list
-    install -d -p %{buildroot}/%{gopath}/src/%{import_path_sec}/$(dirname $file)
-    cp -pav $file %{buildroot}/%{gopath}/src/%{import_path_sec}/$file
-    echo "%%{gopath}/src/%%{import_path_sec}/$file" >> devel.file-list
-done
-
-pushd ../%{repo}-%{v1_commit}
-
-install -d -p %{buildroot}/%{gopath}/src/%{v1_import_path}/
-echo "%%dir %%{gopath}/src/%%{v1_import_path}/." >> ../%{repo}-%{commit}/v1_devel.file-list
-install -d -p %{buildroot}/%{gopath}/src/%{v1_import_path_sec}/
-echo "%%dir %%{gopath}/src/%%{v1_import_path_sec}/." >> ../%{repo}-%{commit}/v1_devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
-    echo "%%dir %%{gopath}/src/%%{v1_import_path}/$(dirname $file)" >> ../%{repo}-%{commit}/v1_devel.file-list
-    install -d -p %{buildroot}/%{gopath}/src/%{v1_import_path}/$(dirname $file)
-    cp -pav $file %{buildroot}/%{gopath}/src/%{v1_import_path}/$file
-    echo "%%{gopath}/src/%%{v1_import_path}/$file" >> ../%{repo}-%{commit}/v1_devel.file-list
-    echo "%%dir %%{gopath}/src/%%{v1_import_path_sec}/$(dirname $file)" >> ../%{repo}-%{commit}/v1_devel.file-list
-    install -d -p %{buildroot}/%{gopath}/src/%{v1_import_path_sec}/$(dirname $file)
-    cp -pav $file %{buildroot}/%{gopath}/src/%{v1_import_path_sec}/$file
-    echo "%%{gopath}/src/%%{v1_import_path_sec}/$file" >> ../%{repo}-%{commit}/v1_devel.file-list
-done
-
+%goinstall
+%goinstall -i %{import_path} -o devel.file-list
+%goinstall -i %{import_path_sec} -o devel.file-list
+
+cw=$(pwd)
+pushd ../tomb-%{v1_commit}
+%goinstall -i %{v1_import_path} -o ${cw}/v1_devel.file-list
+%goinstall -i %{v1_import_path_sec} -o ${cw}/v1_devel.file-list
+
+# TODO(jchaloup): create rpm macros for this!!!
+#github.com/go-tomb/tomb -> gopkg.in/v2/tomb
+pushd %{buildroot}/%{gopath}/src/%{import_path}/
+sed -i 's/"github\.com\/go-tomb\/tomb/"gopkg\.in\/v2\/tomb/g' \
+        $(find . -name '*.go')
+#'github.com/go-tomb/tomb -> gopkg.in/tomb.v2
+cd %{buildroot}/%{gopath}/src/%{import_path_sec}/
+sed -i 's/"github\.com\/go-tomb\/tomb/"gopkg\.in\/tomb\.v2/g' \
+        $(find . -name '*.go')
+#gopkg.in/v1/tomb -> gopkg.in/tomb.v1
+cd %{buildroot}/%{gopath}/src/%{v1_import_path_sec}/
+sed -i 's/"gopkg\.in\/v1\/tomb/"gopkg\.in\/tomb\.v1/g' \
+        $(find . -name '*.go')
 popd
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test.file-list
-for file in $(find . -iname "*_test.go"); do
-    echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
-    install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
-    cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
-    echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
 
 %check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%endif
+%gochecks
+pushd %{buildroot}/%{gopath}/src/%{import_path}/
+%gochecks -i %{import_path}
+cd %{buildroot}/%{gopath}/src/%{import_path_sec}/
+%gochecks
+popd
 
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
 
-%if 0%{?with_devel}
-%files devel -f devel.file-list
+%files devel -f v1_devel.file-list
 %license LICENSE
 %doc README.md
-%dir %{gopath}/src/%{import_path_sec}
 
-%files -n %{v1_name}-devel -f v1_devel.file-list
+%files devel-v2 -f devel.file-list
 %license LICENSE
 %doc README.md
-%dir %{gopath}/src/%{v1_import_path_sec}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test -f unit-test.file-list
-%license LICENSE
-%doc README.md
-%endif
 
 %changelog
+* Wed Oct 31 2018 Robert-André Mauchin <zebob.m@gmail.com> - 0.14.20181031gitd5d1b58
+- Update to new Go packaging
+- Bump to commit dd632973f1e7218eb1089048e0798ec9ae7dceb8 and d5d1b5820637886def9eef33e03a27a9f166942c
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.13.gitd5d1b58
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
@@ -258,4 +147,3 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
 * Mon Jun 15 2015 Marek Skalický <mskalick@redhat.com> - 0-0.1.git14b3d72
 - First package for Fedora
   resolves: #1232221
-
diff --git a/sources b/sources
index e22ca44..c68f8cd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (tomb-dd63297.tar.gz) = 4d566a0f57513f11666fa43c3b991d2356007db54df4f38b97b9719d623b123a6a8a5ed02d14b5d6020fe39162bb3247a7ee1e4054493ff89a4de2cbbe156e89
-SHA512 (tomb-d5d1b58.tar.gz) = 03ac20f7608db7c4ce54cc1ad9dfa62d770c32e1806a131909cb5c1ca4a9708b482e58d0e1bda0dbaff56ed36558a96ce2d4453566813967a32eef5245012a8d
+SHA512 (tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz) = 03ac20f7608db7c4ce54cc1ad9dfa62d770c32e1806a131909cb5c1ca4a9708b482e58d0e1bda0dbaff56ed36558a96ce2d4453566813967a32eef5245012a8d
+SHA512 (tomb-dd632973f1e7218eb1089048e0798ec9ae7dceb8.tar.gz) = 4d566a0f57513f11666fa43c3b991d2356007db54df4f38b97b9719d623b123a6a8a5ed02d14b5d6020fe39162bb3247a7ee1e4054493ff89a4de2cbbe156e89