diff --git a/git-time-metric.spec b/git-time-metric.spec
index c0d48d8..5cb31a6 100644
--- a/git-time-metric.spec
+++ b/git-time-metric.spec
@@ -1,11 +1,22 @@
-%global goipath github.com/git-time-metric/gtm
-Version:        1.3.5
+# Generated by go2rpm
+%bcond_without check
+
+# https://github.com/git-time-metric/gtm
+%global goipath         github.com/git-time-metric/gtm
+Version:                1.3.5
 
 %gometa
 
+%global common_description %{expand:
+Simple, seamless, lightweight time tracking for Git.}
+
+%global golicenses      LICENSE
+%global godocs          AUTHORS README.md
+
 Name:           git-time-metric
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple, seamless, lightweight time tracking for Git
+
 License:        MIT
 URL:            %{gourl}
 Source0:        %{gosource}
@@ -14,52 +25,40 @@ Source0:        %{gosource}
 # https://bugzilla.redhat.com/show_bug.cgi?id=1680200
 ExcludeArch: i686 armv7hl
 
-BuildRequires: git-core
+BuildRequires:  git-core
+BuildRequires:  golang(github.com/briandowns/spinner)
+BuildRequires:  golang(github.com/hako/durafmt)
+BuildRequires:  golang(github.com/hashicorp/go-version)
+BuildRequires:  golang(github.com/jinzhu/now)
+BuildRequires:  golang(github.com/libgit2/git2go)
+BuildRequires:  golang(github.com/mattn/go-isatty)
+BuildRequires:  golang(github.com/mitchellh/cli)
 
 %description
-%{summary}
-
-
-%package -n %{goname}-devel
-Summary:       %{summary}
-BuildArch:     noarch
+%{common_description}
 
-BuildRequires: golang(github.com/briandowns/spinner)
-BuildRequires: golang(github.com/hako/durafmt)
-BuildRequires: golang(github.com/hashicorp/go-version)
-BuildRequires: golang(github.com/jinzhu/now)
-BuildRequires: golang(github.com/libgit2/git2go)
-BuildRequires: golang(github.com/mattn/go-isatty)
-BuildRequires: golang(github.com/mitchellh/cli)
 
-%description -n %{goname}-devel
-%{summary}
-
-This package contains library source intended for building other packages which
-use import path with %{goipath} prefix.
+%gopkg
 
 
 %prep
-%forgeautosetup -p1
-
-# Remove vendored code
-rm -r vendor
+%goprep
 
 
 %build
-%gobuildroot
-%gobuild -o _bin/gtm %{goipath}
+%gobuild -o %{gobuilddir}/bin/gtm %{goipath}
 
 
 %install
-%goinstall
-
-install -vdm 0755 %{buildroot}%{_bindir}
-install -vpm 0755 _bin/gtm %{buildroot}%{_bindir}/
+%gopkginstall
+install -m 0755 -vd                     %{buildroot}%{_bindir}
+install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
 
 
+%if %{with check}
 %check
-%gochecks
+%gocheck
+%endif
 
 
 %files
@@ -67,12 +66,13 @@ install -vpm 0755 _bin/gtm %{buildroot}%{_bindir}/
 %license LICENSE
 %{_bindir}/gtm
 
-%files -n %{goname}-devel -f devel.file-list
-%doc README.md AUTHORS
-%license LICENSE
+%gopkgfiles
 
 
 %changelog
+* Wed Jul 10 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.3.5-3
+- Update to new Go macros
+
 * Thu Mar 21 2019 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.3.5-2
 - Add git-core BR for testing
 - Remove vendored code before build