diff --git a/.gitignore b/.gitignore
index 0c8a5a2..76fb70f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
 /wgctrl-go-28f4e240be2d40c8ae16f3bbc8f05c8ee57fc554.tar.gz
+/wgctrl-go-bd2cb7843e1b98193f01eb288793e741a814a269.tar.gz
+/wgctrl-go-4253848d036c7873fa1fbdfbc2d10ff15dc81ccb.tar.gz
+/wgctrl-go-a9ab2273dd1075ea74b88c76f8757f8b4003fcbf.tar.gz
+/wgctrl-go-a9ab2273dd1075ea74b88c76f8757f8b4003fcbf-vendor.tar.bz2
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..f76503e
--- /dev/null
+++ b/changelog
@@ -0,0 +1,18 @@
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 François Kooman <fkooman@tuxed.net> - 0-0.5.20210127gitbd2cb78
+- Update to commit bd2cb7843e1b98193f01eb288793e741a814a269
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.4
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jul 17 22:28:10 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 0-0.1.20190729git28f4e24
+- Initial package
diff --git a/go-vendor-tools.toml b/go-vendor-tools.toml
new file mode 100644
index 0000000..6ab4062
--- /dev/null
+++ b/go-vendor-tools.toml
@@ -0,0 +1,4 @@
+[archive]
+
+[licensing]
+detector = "askalono"
diff --git a/sources b/sources
index c85a8a1..93e2360 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (wgctrl-go-28f4e240be2d40c8ae16f3bbc8f05c8ee57fc554.tar.gz) = bb7a0eb5ac3a075c2cb694105475cf91b925f5aa962d9c4ba3d8f5f4a898f734643e9328697e8d4bcec75092e488935352aaf6aa575e9746a9d554725e39118d
+SHA512 (wgctrl-go-a9ab2273dd1075ea74b88c76f8757f8b4003fcbf.tar.gz) = 2ae83df64642865e1371635654c7fd056fd2136a86a62ec62b30cb5bdf23c1292774c68cdf6a8f484ba5aa0722b9fd7dfcac43f31f29d658bfca44a844ec4903
+SHA512 (wgctrl-go-a9ab2273dd1075ea74b88c76f8757f8b4003fcbf-vendor.tar.bz2) = dd5090e40e7091e281736e1eb217ff1e93fbc984e1e7559a65071bf4ea0a0a3f01a3466c9b4fd0667e14e9527851e65d6efd4b5ea1c5149e8f37a4972e6f8fcf
diff --git a/wgctrl.spec b/wgctrl.spec
index 031df98..40270e7 100644
--- a/wgctrl.spec
+++ b/wgctrl.spec
@@ -1,77 +1,60 @@
-# Generated by go2rpm 1
-%bcond_without check
+# Generated by go2rpm 1.19.0
+%bcond check 1
 
 # https://github.com/WireGuard/wgctrl-go
 %global goipath         golang.zx2c4.com/wireguard/wgctrl
 %global forgeurl        https://github.com/WireGuard/wgctrl-go
-%global commit          28f4e240be2d40c8ae16f3bbc8f05c8ee57fc554
+%global commit          a9ab2273dd1075ea74b88c76f8757f8b4003fcbf
 
-%gometa
+%gometa -L -f
 
-%global goname          wgctrl
 
-%global common_description %{expand:
-Package Wgctrl enables control of WireGuard interfaces on multiple platforms.}
-
-%global golicenses      LICENSE.md
-%global godocs          CONTRIBUTING.md README.md
-
-Name:           %{goname}
+Name:           wgctrl
 Version:        0
-Release:        0.2%{?dist}
-Summary:        Control of WireGuard interfaces on multiple platforms
+Release:        %autorelease -p
+Summary:        Package wgctrl enables control of WireGuard interfaces on multiple platforms
 
-License:        MIT
+# Generated by go-vendor-tools
+License:        BSD-2-Clause AND BSD-3-Clause AND MIT
 URL:            %{gourl}
 Source0:        %{gosource}
+# Generated by go-vendor-tools
+Source1:        %{archivename}-vendor.tar.bz2
+Source2:        go-vendor-tools.toml
 
-BuildRequires:  golang(github.com/mdlayher/genetlink)
-BuildRequires:  golang(github.com/mdlayher/netlink)
-BuildRequires:  golang(github.com/mdlayher/netlink/nlenc)
-BuildRequires:  golang(golang.org/x/crypto/curve25519)
-BuildRequires:  golang(golang.org/x/sys/unix)
-
-%if %{with check}
-# Tests
-BuildRequires:  golang(github.com/google/go-cmp/cmp)
-BuildRequires:  golang(github.com/mdlayher/genetlink/genltest)
-BuildRequires:  golang(github.com/mdlayher/netlink/nltest)
-BuildRequires:  golang(github.com/mikioh/ipaddr)
-%endif
+BuildRequires:  go-vendor-tools
 
 %description
-%{common_description}
-
-%gopkg
+Package wgctrl enables control of WireGuard interfaces on multiple platforms.
 
 %prep
-%goprep
+%goprep -p1
+tar -xf %{S:1}
+
+%generate_buildrequires
+%go_vendor_license_buildrequires -c %{S:2}
 
 %build
+%global gomodulesmode GO111MODULE=on
 for cmd in cmd/* ; do
   %gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd
 done
 
 %install
-%gopkginstall
+%go_vendor_license_install -c %{S:2}
 install -m 0755 -vd                     %{buildroot}%{_bindir}
 install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
 
-%if %{with check}
 %check
-%gocheck
+%go_vendor_license_check -c %{S:2}
+%if %{with check}
+%gotest ./...
 %endif
 
-%files
-%license LICENSE.md
+%files -f %{go_vendor_license_filelist}
 %doc CONTRIBUTING.md README.md
-%{_bindir}/*
+%{_bindir}/wgctrl
 
-%gopkgfiles
 
 %changelog
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 17 22:28:10 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 0-0.1.20190729git28f4e24
-- Initial package
+%autochangelog