diff --git a/golang-packaging.changes b/golang-packaging.changes
index 74cdcba..eda19ea 100644
--- a/golang-packaging.changes
+++ b/golang-packaging.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun  1 12:24:34 UTC 2017 - thipp@suse.de
+
+- fix GOPATH for Provides and Requires 
+
 -------------------------------------------------------------------
 Wed May 24 11:33:20 UTC 2017 - thipp@suse.de
 
diff --git a/gopath.patch b/gopath.patch
index b5d5705..b329b2d 100644
--- a/gopath.patch
+++ b/gopath.patch
@@ -1,22 +1,24 @@
 diff --git a/golang.prov b/golang.prov
-index f373246..08aca8e 100755
+index f373246..8bdc52f 100755
 --- a/golang.prov
 +++ b/golang.prov
-@@ -1,6 +1,5 @@
+@@ -1,6 +1,6 @@
  #!/usr/bin/env bash
  
 -export GOPATH=${RPM_BUILD_ROOT}/usr/share/go/contrib
++export GOPATH="${RPM_BUILD_ROOT}/usr/share/go/$(rpm --eval %go_api_ver)/contrib:${GOPATH}"
  export GO15VENDOREXPERIMENT=1
  
  IMPORT="$(cat /tmp/importpath.txt)"
 diff --git a/golang.req b/golang.req
-index 41029a6..6000f27 100755
+index 41029a6..d501ab5 100755
 --- a/golang.req
 +++ b/golang.req
-@@ -1,6 +1,5 @@
+@@ -1,6 +1,6 @@
  #!/usr/bin/env bash
  
 -export GOPATH=${RPM_BUILD_ROOT}/usr/share/go/contrib
++export GOPATH="${RPM_BUILD_ROOT}/usr/share/go/$(rpm --eval %go_api_ver)/contrib:${GOPATH}"
  export GO15VENDOREXPERIMENT=1
  
  IMPORT="$(cat /tmp/importpath.txt)"