diff --git a/.containernetworking-plugins.metadata b/.containernetworking-plugins.metadata
index c4e3f51..8e4b43d 100644
--- a/.containernetworking-plugins.metadata
+++ b/.containernetworking-plugins.metadata
@@ -1 +1 @@
-90e6339a94b210443a08a3f6ded99e7913cf6a78 SOURCES/v0.8.6.tar.gz
+e226b3d4fc63f760d469aa0a123abdcd4ba74ebf SOURCES/v0.9.0.tar.gz
diff --git a/.gitignore b/.gitignore
index 88af467..91ec6bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/v0.8.6.tar.gz
+SOURCES/v0.9.0.tar.gz
diff --git a/SPECS/containernetworking-plugins.spec b/SPECS/containernetworking-plugins.spec
index c8f64ce..9268308 100644
--- a/SPECS/containernetworking-plugins.spec
+++ b/SPECS/containernetworking-plugins.spec
@@ -1,16 +1,11 @@
-%global with_debug 1
 %global with_check 0
 
-%if 0%{?with_debug}
 %global _find_debuginfo_dwz_opts %{nil}
 %global _dwz_low_mem_die_limit 0
-%else
-%global debug_package   %{nil}
-%endif
 
 %if ! 0%{?gobuild:1}
 %define gobuild(o:) \
-go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
+go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**};
 %define gotest(o:) go test
 %endif
 
@@ -23,13 +18,17 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUIL
 %global import_path %{provider_prefix}
 
 Name: containernetworking-plugins
-Version: 0.8.6
-Release: 2%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
 Summary: CNI network plugins
 License: ASL 2.0
 URL: https://%{provider_prefix}
 Source0: https://%{provider_prefix}/archive/v%{version}.tar.gz
-ExcludeArch: ppc64 i686
+# https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures
+#ExclusiveArch: %%{go_arches}
+# still use arch exclude as the macro above still refers %%{ix86} in RHEL8.4:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1905383
+ExcludeArch: %{ix86}
 BuildRequires: golang >= 1.12.12-4
 BuildRequires: git
 BuildRequires: go-md2man
@@ -120,6 +119,22 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_libexecdir}/cni/*
 
 %changelog
+* Thu Dec 10 2020 Jindrich Novy <jnovy@redhat.com> - 0.9.0-1
+- update to https://github.com/containernetworking/plugins/releases/tag/v0.9.0
+- Related: #1888571
+
+* Tue Dec 08 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.7-3
+- use ExcludeArch: i686 again as the go_arches macro is broken
+- Related: #1888571
+
+* Thu Nov 05 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.7-2
+- attempt to fix linker error with golang-1.15
+- Related: #1888571
+
+* Thu Oct 22 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.7-1
+- synchronize with stream-container-tools-rhel8-rhel-8.4.0
+- Related: #1888571
+
 * Tue Aug 11 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.6-2
 - propagate proper CFLAGS to CGO_CFLAGS to assure code hardening and optimization
 - Related: #1821193