diff --git a/sys-devel/byfl/byfl-1.4-r1.ebuild b/sys-devel/byfl/byfl-1.4-r1.ebuild
index 55f157810b318..a6d148c8cea13 100644
--- a/sys-devel/byfl/byfl-1.4-r1.ebuild
+++ b/sys-devel/byfl/byfl-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -8,19 +8,19 @@ inherit flag-o-matic
 
 if [ "${PV}" = "9999" ]; then
 	LLVM_VERSION="3.8.0"
-	EGIT_REPO_URI="git://github.com/losalamos/${PN^b}.git https://github.com/losalamos/${PN}.git"
+	EGIT_REPO_URI="git://github.com/lanl/${PN^b}.git https://github.com/lanl/${PN}.git"
 	inherit autotools git-r3
 	KEYWORDS=""
 else
 	LLVM_VERSION="3.7.0"
 	MY_P="${P}-llvm-${LLVM_VERSION}"
-	SRC_URI="https://github.com/losalamos/Byfl/releases/download/v${MY_P#${PN}-}/${MY_P}.tar.gz"
+	SRC_URI="https://github.com/lanl/Byfl/releases/download/v${MY_P#${PN}-}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~amd64-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
 DESCRIPTION="Compiler-based Application Analysis"
-HOMEPAGE="https://github.com/losalamos/Byfl"
+HOMEPAGE="https://github.com/lanl/Byfl"
 
 SLOT="0"
 LICENSE="BSD"
diff --git a/sys-devel/byfl/byfl-1.5.ebuild b/sys-devel/byfl/byfl-1.5.ebuild
index c0ffb16d75a37..0c0104c41858c 100644
--- a/sys-devel/byfl/byfl-1.5.ebuild
+++ b/sys-devel/byfl/byfl-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -8,19 +8,19 @@ inherit flag-o-matic
 
 if [ "${PV}" = "9999" ]; then
 	LLVM_VERSION="3.8.0"
-	EGIT_REPO_URI="git://github.com/losalamos/${PN^b}.git https://github.com/losalamos/${PN}.git"
+	EGIT_REPO_URI="git://github.com/lanl/${PN^b}.git https://github.com/lanl/${PN}.git"
 	inherit autotools git-r3
 	KEYWORDS=""
 else
 	LLVM_VERSION="3.8.0"
 	MY_P="${P}-llvm-${LLVM_VERSION}"
-	SRC_URI="https://github.com/losalamos/Byfl/releases/download/v${MY_P#${PN}-}/${MY_P}.tar.gz"
+	SRC_URI="https://github.com/lanl/Byfl/releases/download/v${MY_P#${PN}-}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~amd64-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
 DESCRIPTION="Compiler-based Application Analysis"
-HOMEPAGE="https://github.com/losalamos/Byfl"
+HOMEPAGE="https://github.com/lanl/Byfl"
 
 SLOT="0"
 LICENSE="BSD"
diff --git a/sys-devel/byfl/byfl-9999.ebuild b/sys-devel/byfl/byfl-9999.ebuild
index c0ffb16d75a37..0c0104c41858c 100644
--- a/sys-devel/byfl/byfl-9999.ebuild
+++ b/sys-devel/byfl/byfl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -8,19 +8,19 @@ inherit flag-o-matic
 
 if [ "${PV}" = "9999" ]; then
 	LLVM_VERSION="3.8.0"
-	EGIT_REPO_URI="git://github.com/losalamos/${PN^b}.git https://github.com/losalamos/${PN}.git"
+	EGIT_REPO_URI="git://github.com/lanl/${PN^b}.git https://github.com/lanl/${PN}.git"
 	inherit autotools git-r3
 	KEYWORDS=""
 else
 	LLVM_VERSION="3.8.0"
 	MY_P="${P}-llvm-${LLVM_VERSION}"
-	SRC_URI="https://github.com/losalamos/Byfl/releases/download/v${MY_P#${PN}-}/${MY_P}.tar.gz"
+	SRC_URI="https://github.com/lanl/Byfl/releases/download/v${MY_P#${PN}-}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~amd64-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
 DESCRIPTION="Compiler-based Application Analysis"
-HOMEPAGE="https://github.com/losalamos/Byfl"
+HOMEPAGE="https://github.com/lanl/Byfl"
 
 SLOT="0"
 LICENSE="BSD"
diff --git a/sys-devel/byfl/metadata.xml b/sys-devel/byfl/metadata.xml
index 60446e46bd454..72ecaff33a5b1 100644
--- a/sys-devel/byfl/metadata.xml
+++ b/sys-devel/byfl/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Christoph Junghans</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">losalamos/Byfl</remote-id>
+		<remote-id type="github">lanl/Byfl</remote-id>
 	</upstream>
 </pkgmetadata>