diff --git a/.containernetworking-plugins.metadata b/.containernetworking-plugins.metadata
index c4e3f51..dd21897 100644
--- a/.containernetworking-plugins.metadata
+++ b/.containernetworking-plugins.metadata
@@ -1 +1 @@
-90e6339a94b210443a08a3f6ded99e7913cf6a78 SOURCES/v0.8.6.tar.gz
+a9250841d8de9b9c00a7a92f000164ec4fafbe6b SOURCES/v0.8.7.tar.gz
diff --git a/.gitignore b/.gitignore
index 88af467..9eff0e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/v0.8.6.tar.gz
+SOURCES/v0.8.7.tar.gz
diff --git a/SPECS/containernetworking-plugins.spec b/SPECS/containernetworking-plugins.spec
index c8f64ce..f678618 100644
--- a/SPECS/containernetworking-plugins.spec
+++ b/SPECS/containernetworking-plugins.spec
@@ -10,7 +10,7 @@
 
 %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 -x %{?**};
 %define gotest(o:) go test
 %endif
 
@@ -23,7 +23,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUIL
 %global import_path %{provider_prefix}
 
 Name: containernetworking-plugins
-Version: 0.8.6
+Version: 0.8.7
 Release: 2%{?dist}
 Summary: CNI network plugins
 License: ASL 2.0
@@ -120,6 +120,14 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_libexecdir}/cni/*
 
 %changelog
+* 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