diff --git a/Makefile b/Makefile
index ee85540692..a89eebf6a1 100644
--- a/Makefile
+++ b/Makefile
@@ -293,7 +293,7 @@ FORCE_BUILD=
 
 # for the go build sources
 GOSOURCES=$(BUILDTOOLS_BIN)/go-sources-and-licenses
-GOSOURCES_VERSION=91c965e0392ece0362bb9ac017ed052b679fc6f9
+GOSOURCES_VERSION=c73009667f4871c084c1f2164063321c81d053a2
 GOSOURCES_SOURCE=github.com/deitch/go-sources-and-licenses
 
 
diff --git a/tools/collect-sources.sh b/tools/collect-sources.sh
index c9616e156c..182f33de38 100755
--- a/tools/collect-sources.sh
+++ b/tools/collect-sources.sh
@@ -29,7 +29,8 @@ tar -xf "$rootfs" -C "$tmproot" --exclude "dev/*"
 {
 "${eve}/tools/get-alpine-pkg-source.sh" -s "${tmpout}" -e "${tmproot}" -p alpine
 "${eve}/tools/get-kernel-source.sh" -s "${tmpout}" -p kernel
-"${eve}/build-tools/bin/go-sources-and-licenses" sources -d "${eve}/pkg" --find --recursive --out "${tmpout}" --prefix golang --template 'golang,{{.Module}}@{{.Version}},{{.Version}},{{.Path}}'
+"${eve}/build-tools/bin/go-sources-and-licenses" sources -s "${eve}/pkg" --find --recursive --out "${tmpout}" --prefix golang --template 'golang,{{.Module}}@{{.Version}},{{.Version}},{{.Path}}'
+"${eve}/build-tools/bin/go-sources-and-licenses" sources -b "${tmproot}" --find --recursive --out "${tmpout}" --prefix golang --template 'golang,{{.Module}}@{{.Version}},{{.Version}},{{.Path}}'
 } > "${manifest}"
 
 tar -zcf "${outfile}" -C "${tmpout}" .