diff --git a/sys-block/open-iscsi/open-iscsi-2.1.4.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
similarity index 98%
rename from sys-block/open-iscsi/open-iscsi-2.1.4.ebuild
rename to sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
index cfb0f79f45735..48c3a385ff333 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.4.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.4-r1.ebuild
@@ -72,7 +72,7 @@ pkg_setup() {
 src_prepare() {
 	sed -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' \
 		-i etc/iscsid.conf || die
-	sed -e 's@\(/sbin/\)@/usr\1@' \
+	sed -e '/[^usr]\/sbin/s@\(/sbin/\)@/usr\1@' \
 		-i etc/systemd/iscsi* || die
 	default
 
@@ -115,7 +115,7 @@ src_install() {
 
 	local unit
 	local units=(
-		iscsi.service
+		iscsi{,-init}.service
 		iscsid.{service,socket}
 		iscsiuio.{service,socket}
 	)