diff --git a/dev-util/strace/strace-4.13.ebuild b/dev-util/strace/strace-4.13.ebuild
index f4c967e907973..aed6e6321d94f 100644
--- a/dev-util/strace/strace-4.13.ebuild
+++ b/dev-util/strace/strace-4.13.ebuild
@@ -6,7 +6,8 @@ EAPI="5"
 inherit flag-o-matic eutils
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://strace.git.sourceforge.net/gitroot/strace/strace"
+	EGIT_REPO_URI="git://git.code.sf.net/p/strace/code"
+	EGIT_PROJECT="${PN}"
 	inherit git-2 autotools
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
diff --git a/dev-util/strace/strace-4.14.ebuild b/dev-util/strace/strace-4.14.ebuild
index b45d41235bf08..6c5ede46696de 100644
--- a/dev-util/strace/strace-4.14.ebuild
+++ b/dev-util/strace/strace-4.14.ebuild
@@ -6,7 +6,8 @@ EAPI="5"
 inherit flag-o-matic eutils
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://strace.git.sourceforge.net/gitroot/strace/strace"
+	EGIT_REPO_URI="git://git.code.sf.net/p/strace/code"
+	EGIT_PROJECT="${PN}"
 	inherit git-2 autotools
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
diff --git a/dev-util/strace/strace-4.9.ebuild b/dev-util/strace/strace-4.9.ebuild
index 61def4efa183b..2eb1783cb1002 100644
--- a/dev-util/strace/strace-4.9.ebuild
+++ b/dev-util/strace/strace-4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,7 +7,8 @@ EAPI="4"
 inherit flag-o-matic eutils
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://strace.git.sourceforge.net/gitroot/strace/strace"
+	EGIT_REPO_URI="git://git.code.sf.net/p/strace/code"
+	EGIT_PROJECT="${PN}"
 	inherit git-2 autotools
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild
index b45d41235bf08..6c5ede46696de 100644
--- a/dev-util/strace/strace-9999.ebuild
+++ b/dev-util/strace/strace-9999.ebuild
@@ -6,7 +6,8 @@ EAPI="5"
 inherit flag-o-matic eutils
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://strace.git.sourceforge.net/gitroot/strace/strace"
+	EGIT_REPO_URI="git://git.code.sf.net/p/strace/code"
+	EGIT_PROJECT="${PN}"
 	inherit git-2 autotools
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"