diff --git a/.gitignore b/.gitignore
index 3886989..1d714a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /go-connections-0.4.0.tar.gz
+/go-connections-58542c764a1173ea3dac965d89146c931a2946f7.tar.gz
diff --git a/0001-update-expired-Lets-Encrypt-CA-fixture.patch b/0001-update-expired-Lets-Encrypt-CA-fixture.patch
index 8142a81..3c308fd 100644
--- a/0001-update-expired-Lets-Encrypt-CA-fixture.patch
+++ b/0001-update-expired-Lets-Encrypt-CA-fixture.patch
@@ -1,43 +1,42 @@
 diff --color -ur go-connections-0.4.0.orig/tlsconfig/config_test.go go-connections-0.4.0/tlsconfig/config_test.go
 --- go-connections-0.4.0.orig/tlsconfig/config_test.go	2018-02-28 08:10:15.000000000 -0600
 +++ go-connections-0.4.0/tlsconfig/config_test.go	2022-01-25 11:55:14.387244420 -0600
-@@ -11,35 +11,41 @@
- 	"testing"
+@@ -13,36 +13,40 @@ import (
  )
  
--// This is the currently active LetsEncrypt IdenTrust cross-signed CA cert.  It expires Mar 17, 2021.
-+// This is the currently active Let’s Encrypt R3 (RSA 2048, O = Let's Encrypt, CN = R3)
+ // This is the currently active Let’s Encrypt R3 (RSA 2048, O = Let's Encrypt, CN = R3)
+-// cross-signed CA Intermediate cert, downloaded from: https://letsencrypt.org/certs/lets-encrypt-r3-cross-signed.pem
+-// It expires Sep 29 19:21:40 2021 GMT
 +// CA Intermediate cert, downloaded from: https://letsencrypt.org/certs/lets-encrypt-r3.pem
 +// It expires Sep 15 16:00:00 2025 GMT
-+// download updated versions from https://letsencrypt.org/certificates/
+ // download updated versions from https://letsencrypt.org/certificates/
  const (
  	systemRootTrustedCert = `
  -----BEGIN CERTIFICATE-----
--MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
+-MIIEZTCCA02gAwIBAgIQQAF1BIMUpMghjISpDBbN3zANBgkqhkiG9w0BAQsFADA/
 -MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
--DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
--SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
--GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
--AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
--q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
--SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
--Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
--a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
--/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
--AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
--CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
--bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
--c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
--VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
--ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
--MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
--Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
--AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
--uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
--wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
--X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
--PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
--KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
+-DkRTVCBSb290IENBIFgzMB4XDTIwMTAwNzE5MjE0MFoXDTIxMDkyOTE5MjE0MFow
+-MjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxCzAJBgNVBAMT
+-AlIzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuwIVKMz2oJTTDxLs
+-jVWSw/iC8ZmmekKIp10mqrUrucVMsa+Oa/l1yKPXD0eUFFU1V4yeqKI5GfWCPEKp
+-Tm71O8Mu243AsFzzWTjn7c9p8FoLG77AlCQlh/o3cbMT5xys4Zvv2+Q7RVJFlqnB
+-U840yFLuta7tj95gcOKlVKu2bQ6XpUA0ayvTvGbrZjR8+muLj1cpmfgwF126cm/7
+-gcWt0oZYPRfH5wm78Sv3htzB2nFd1EbjzK0lwYi8YGd1ZrPxGPeiXOZT/zqItkel
+-/xMY6pgJdz+dU/nPAeX1pnAXFK9jpP+Zs5Od3FOnBv5IhR2haa4ldbsTzFID9e1R
+-oYvbFQIDAQABo4IBaDCCAWQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8E
+-BAMCAYYwSwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5p
+-ZGVudHJ1c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTE
+-p7Gkeyxx+tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEE
+-AYLfEwEBATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2Vu
+-Y3J5cHQub3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0
+-LmNvbS9EU1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYf
+-r52LFMLGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0B
+-AQsFAAOCAQEA2UzgyfWEiDcx27sT4rP8i2tiEmxYt0l+PAK3qB8oYevO4C5z70kH
+-ejWEHx2taPDY/laBL21/WKZuNTYQHHPD5b1tXgHXbnL7KqC401dk5VvCadTQsvd8
+-S8MXjohyc9z9/G2948kLjmE6Flh9dDYrVYA9x2O+hEPGOaEOa1eePynBgPayvUfL
+-qjBstzLhWVQLGAkXXmNs+5ZnPBxzDJOLxhF2JIbeQAcH5H0tZrUlo5ZYyOqA7s9p
+-O5b85o3AM/OJ+CktFBQtfvBhcJVd9wvlwPsk+uyOy2HI7mNxKKgsBTt375teA2Tw
+-UdHkhVNcsAKX1H7GNNLOEADksd86wuoXvg==
 +MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
 +TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
 +cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw
diff --git a/golang-github-docker-connections.spec b/golang-github-docker-connections.spec
index feeb11e..35dd4a8 100644
--- a/golang-github-docker-connections.spec
+++ b/golang-github-docker-connections.spec
@@ -1,9 +1,11 @@
-# Generated by go2rpm
+# Generated by go2rpm 1.8.0
 %bcond_without check
+%global debug_package %{nil}
 
 # https://github.com/docker/go-connections
 %global goipath         github.com/docker/go-connections
 Version:                0.4.0
+%global commit          58542c764a1173ea3dac965d89146c931a2946f7
 
 %gometa
 
@@ -17,23 +19,13 @@ Name:           %{goname}
 Release:        %autorelease
 Summary:        Utility package to work with network connections
 
-# Upstream license specification: Apache-2.0
-License:        ASL 2.0
+License:        Apache-2.0
 URL:            %{gourl}
-Source0:        %{gosource}
-# update expired Lets Encrypt CA fixture
-Patch0:         https://github.com/docker/go-connections/commit/f454ee8e77fd2360bf8f49a76ab749c52eb58348.patch#/0001-update-expired-Lets-Encrypt-CA-fixture.patch
+Source:         %{gosource}
+# Update expired cert for tests
+Patch0:         0001-update-expired-Lets-Encrypt-CA-fixture.patch
 
-BuildRequires:  golang(github.com/pkg/errors)
-BuildRequires:  golang(golang.org/x/net/proxy)
-
-%if %{with check}
-# Tests
-BuildRequires:  golang(github.com/stretchr/testify/assert)
-%endif
-
-%description
-%{common_description}
+%description %{common_description}
 
 %gopkg
 
@@ -41,6 +33,9 @@ BuildRequires:  golang(github.com/stretchr/testify/assert)
 %goprep
 %patch0 -p1
 
+%generate_buildrequires
+%go_generate_buildrequires
+
 %install
 %gopkginstall
 
diff --git a/sources b/sources
index ef1995e..e1f435c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (go-connections-0.4.0.tar.gz) = b8b84bf0d6a0ff7b70073fc0929613385c719cefbbd9f63dd2075930adf93b9155e0c1776ec01bf1a845b32ed92854252e3ea668d4c9d46e66874b04b891cb45
+SHA512 (go-connections-58542c764a1173ea3dac965d89146c931a2946f7.tar.gz) = 58dc95929fd852e0e4a3cd296becbe887ea4c0511da8effff0f09aaf2efe9e348c35bbea70b94ceea74c18af7b47204a39683a447052db8ad31647872e7163a5