diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index d7cbb8374..cabb058b2 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -19,7 +19,7 @@ pkgbase=go
 pkgname=(go go-pie)
 epoch=2
 pkgver=1.11.5
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 url='https://golang.org/'
 license=(BSD)
@@ -50,7 +50,6 @@ prepare() {
 
 build() {
   export GOPATH="$srcdir/"
-  export GO_GCFLAGS="-trimpath=$GOPATH"
 
   for _pkgname in ${pkgname[@]}; do
     export GOROOT="$srcdir/$_pkgname"
@@ -109,6 +108,11 @@ package_go-pie() {
   conflicts=(go)
 
   _package $pkgname
+
+  # linux_amd64 is essentially the content of linux_amd64_shared, however there might
+  # be cases where the user could generate the _shared directory as it's missing in go-pie.
+  # Make sure it exists without rebuilding std with -buildmode=pie.
+  cp -a "$pkgdir/usr/lib/go/pkg/linux_${GOARCH}/" "$pkgdir/usr/lib/go/pkg/linux_${GOARCH}_shared"
 }
 
 # vim: ts=2 sw=2 et