diff --git a/sys-devel/patch/patch-2.7.6-r7.ebuild b/sys-devel/patch/patch-2.7.6-r8.ebuild
similarity index 94%
rename from sys-devel/patch/patch-2.7.6-r7.ebuild
rename to sys-devel/patch/patch-2.7.6-r8.ebuild
index 5086678d26635..6ecba54d4dddd 100644
--- a/sys-devel/patch/patch-2.7.6-r7.ebuild
+++ b/sys-devel/patch/patch-2.7.6-r8.ebuild
@@ -68,8 +68,9 @@ src_configure() {
 		# rename to gpatch for better BSD compatibility
 		--program-prefix=g
 	)
-	# Do not let $ED mess up the search for `ed` 470210.
-	ac_cv_path_ED=$(type -P ed) \
+	# Do not let $ED or $PATH (split-usr) mess up the search for `ed`:
+	# bug 470210 / bug 957593
+	ac_cv_path_ED="${EPREFIX}/bin/ed" \
 		econf "${myeconfargs[@]}"
 }
 
diff --git a/sys-devel/patch/patch-2.8.ebuild b/sys-devel/patch/patch-2.8-r1.ebuild
similarity index 93%
rename from sys-devel/patch/patch-2.8.ebuild
rename to sys-devel/patch/patch-2.8-r1.ebuild
index 2eceb5f473555..30b3eb9f3a660 100644
--- a/sys-devel/patch/patch-2.8.ebuild
+++ b/sys-devel/patch/patch-2.8-r1.ebuild
@@ -58,8 +58,9 @@ src_configure() {
 		# rename to gpatch for better BSD compatibility
 		--program-prefix=g
 	)
-	# Do not let $ED mess up the search for `ed` 470210.
-	ac_cv_path_ED=$(type -P ed) \
+	# Do not let $ED or $PATH (split-usr) mess up the search for `ed`:
+	# bug 470210 / bug 957593
+	ac_cv_path_ED="${EPREFIX}/bin/ed" \
 		econf "${myeconfargs[@]}"
 }