diff --git a/README.md b/README.md
deleted file mode 100644
index ef21634..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# containernetworking-plugins
-
-The containernetworking-plugins package
\ No newline at end of file
diff --git a/containernetworking-plugins.spec b/containernetworking-plugins.spec
index bb02aa1..1c30513 100644
--- a/containernetworking-plugins.spec
+++ b/containernetworking-plugins.spec
@@ -1,16 +1,14 @@
-%global with_debug 1
 %global with_check 0
 
-%if 0%{?with_debug}
+# https://bugzilla.redhat.com/show_bug.cgi?id=1904567
+%global _lto_cflags %%{nil}
+
 %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:-} -linkmode=external -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
 
@@ -24,12 +22,13 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUIL
 
 Name: containernetworking-plugins
 Version: 0.8.7
-Release: 2%{?dist}
+Release: 3%{?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}
 BuildRequires: golang >= 1.12.12-4
 BuildRequires: git
 BuildRequires: go-md2man
@@ -120,6 +119,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_libexecdir}/cni/*
 
 %changelog
+* Mon Dec 07 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.7-3
+- use dedicated macro to build only on supported arches
+- make build logs more readable
+- always compile with debuginfo enabled
+
 * Thu Nov 05 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.7-2
 - attempt to fix linker error with golang-1.15