diff --git a/dev-lang/go/go-1.20.14.ebuild b/dev-lang/go/go-1.20.14-r1.ebuild
similarity index 99%
rename from dev-lang/go/go-1.20.14.ebuild
rename to dev-lang/go/go-1.20.14-r1.ebuild
index 73884ae..1400387 100644
--- a/dev-lang/go/go-1.20.14.ebuild
+++ b/dev-lang/go/go-1.20.14-r1.ebuild
@@ -31,7 +31,10 @@ BDEPEND="
 		>=dev-lang/go-bootstrap-${BOOTSTRAP_MIN_VER}
 	)
 "
-RDEPEND="app-eselect/eselect-go"
+RDEPEND="
+	app-eselect/eselect-go
+	dev-libs/golang-rebuild-set
+"
 
 # the *.syso files have writable/executable stacks
 QA_EXECSTACK='*.syso'
diff --git a/dev-lang/go/go-1.21.7.ebuild b/dev-lang/go/go-1.21.7-r1.ebuild
similarity index 99%
rename from dev-lang/go/go-1.21.7.ebuild
rename to dev-lang/go/go-1.21.7-r1.ebuild
index 2811dca..22d3d19 100644
--- a/dev-lang/go/go-1.21.7.ebuild
+++ b/dev-lang/go/go-1.21.7-r1.ebuild
@@ -31,7 +31,10 @@ BDEPEND="
 		>=dev-lang/go-bootstrap-${BOOTSTRAP_MIN_VER}
 	)
 "
-RDEPEND="app-eselect/eselect-go"
+RDEPEND="
+	app-eselect/eselect-go
+	dev-libs/golang-rebuild-set
+"
 
 # the *.syso files have writable/executable stacks
 QA_EXECSTACK='*.syso'
diff --git a/dev-lang/go/go-1.22.0.ebuild b/dev-lang/go/go-1.22.0-r1.ebuild
similarity index 99%
rename from dev-lang/go/go-1.22.0.ebuild
rename to dev-lang/go/go-1.22.0-r1.ebuild
index 5a4d1d5..78c6f7a 100644
--- a/dev-lang/go/go-1.22.0.ebuild
+++ b/dev-lang/go/go-1.22.0-r1.ebuild
@@ -31,7 +31,10 @@ BDEPEND="
 		>=dev-lang/go-bootstrap-${BOOTSTRAP_MIN_VER}
 	)
 "
-RDEPEND="app-eselect/eselect-go"
+RDEPEND="
+	app-eselect/eselect-go
+	dev-libs/golang-rebuild-set
+"
 
 # the *.syso files have writable/executable stacks
 QA_EXECSTACK='*.syso'