diff --git a/golang-github-coreos-go-oidc.spec b/golang-github-coreos-go-oidc.spec
index e4f2da4..fcea5f1 100644
--- a/golang-github-coreos-go-oidc.spec
+++ b/golang-github-coreos-go-oidc.spec
@@ -1,169 +1,58 @@
-%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         coreos
-%global repo            go-oidc
 # https://github.com/coreos/go-oidc
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path     %{provider_prefix}
+%global provider_prefix github.com/coreos/go-oidc
+%global gobaseipath     %{provider_prefix}
 %global commit          ee7cb1fb480df22f7d8c4c90199e438e454ca3b6
-%global shortcommit     %(c=%{commit}; echo ${c:0:7})
+%global commitdate      20150808
 
-Name:           golang-%{provider}-%{project}-%{repo}
+%gocraftmeta -i
+
+Name:           %{goname}
 Version:        0
-Release:        0.8.git%{shortcommit}%{?dist}
+Release:        0.9.%{commitdate}git%{shortcommit}%{?dist}
 Summary:        Go libraries for implementing OIDC clients and servers
 License:        ASL 2.0
-URL:            https://%{provider_prefix}
-Source0:        https://%{provider_prefix}/archive/%{commit}/%{repo}-%{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}
 
 %description
 %{summary}
 
-%if 0%{?with_devel}
 %package devel
 Summary:       %{summary}
 BuildArch:     noarch
 
-%if 0%{?with_check}
 BuildRequires: golang(github.com/coreos/pkg/capnslog)
 BuildRequires: golang(github.com/coreos/pkg/health)
 BuildRequires: golang(github.com/coreos/pkg/timeutil)
 BuildRequires: golang(github.com/jonboulle/clockwork)
-%endif
-
-Requires:      golang(github.com/coreos/pkg/capnslog)
-Requires:      golang(github.com/coreos/pkg/health)
-Requires:      golang(github.com/coreos/pkg/timeutil)
-Requires:      golang(github.com/jonboulle/clockwork)
-
-Provides:      golang(%{import_path}/http) = %{version}-%{release}
-Provides:      golang(%{import_path}/jose) = %{version}-%{release}
-Provides:      golang(%{import_path}/key) = %{version}-%{release}
-Provides:      golang(%{import_path}/oauth2) = %{version}-%{release}
-Provides:      golang(%{import_path}/oidc) = %{version}-%{release}
 
 %description devel
 %{summary}
 
 This package contains library source intended for
 building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test
-Summary:         Unit tests for %{name} package
-%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
+%{gobaseipath} prefix.
 
 %prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup
 
 %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
-# 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
-done
-%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
+%goinstall
 
 %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}/http
-%gotest %{import_path}/jose
-%gotest %{import_path}/key
-%gotest %{import_path}/oauth2
-%gotest %{import_path}/oidc
-%endif
+%gochecks %{gobaseipath}/http
 
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
 
-%if 0%{?with_devel}
 %files devel -f devel.file-list
 %license LICENSE
 %doc README.md CONTRIBUTING.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test -f unit-test.file-list
-%license LICENSE
-%doc README.md CONTRIBUTING.md
-%endif
 
 %changelog
+* Wed Feb 28 2018 Jan Chaloupka <jchaloup@redhat.com> - 0-0.9.20150808gitee7cb1f
+- Autogenerate some parts using the new macros
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.8.gitee7cb1f
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild