diff --git a/dev-lang/go/files/go-sets.conf b/dev-lang/go/files/go-sets.conf
new file mode 100644
index 0000000000000..01ad4a8b3d4f7
--- /dev/null
+++ b/dev-lang/go/files/go-sets.conf
@@ -0,0 +1,7 @@
+# Installed packages that inherit from known Go related eclasses.
+# This is useful after a dev-lang/go version change to rebuild all
+# software written in Go.
+[golang-rebuild]
+class = portage.sets.dbapi.VariableSet
+variable = INHERITED
+includes = golang-base golang-build golang-vcs golang-vcs-snapshot go-module
diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
index c81e94e12355d..1157708bdb568 100644
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-9999.ebuild
@@ -178,6 +178,10 @@ src_install()
 	done
 	einstalldocs
 
+	# install the @golang-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/go-sets.conf go.conf
+
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# fix install_name for test object (binutils_test) on Darwin, it
 		# is never used in real circumstances
@@ -189,8 +193,6 @@ src_install()
 
 pkg_postinst() {
 	[[ -z ${REPLACING_VERSIONS} ]] && return
-	has_version "<sys-apps/portage-3.0.9" && return
-
 	einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
 	einfo "all packages compiled with previous versions of ${CATEGORY}/${PN}"
 	einfo "due to the static linking nature of go."