diff --git a/app-shells/mpibash/metadata.xml b/app-shells/mpibash/metadata.xml
index 2254f647f02ed..1a4b981f11282 100644
--- a/app-shells/mpibash/metadata.xml
+++ b/app-shells/mpibash/metadata.xml
@@ -10,6 +10,6 @@
     <name>Gentoo Science Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">losalamos/MPI-Bash</remote-id>
+    <remote-id type="github">lanl/MPI-Bash</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-shells/mpibash/mpibash-1.2.ebuild b/app-shells/mpibash/mpibash-1.2.ebuild
index 35d89c65384d8..986802067491a 100644
--- a/app-shells/mpibash/mpibash-1.2.ebuild
+++ b/app-shells/mpibash/mpibash-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,17 +7,17 @@ EAPI=5
 inherit autotools-utils multilib
 
 if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="git://github.com/losalamos/MPI-Bash.git https://github.com/losalamos/MPI-Bash.git"
+	EGIT_REPO_URI="git://github.com/lanl/MPI-Bash.git https://github.com/lanl/MPI-Bash.git"
 	inherit git-r3
 	KEYWORDS=""
 	AUTOTOOLS_AUTORECONF=1
 else
-	SRC_URI="https://github.com/losalamos/MPI-Bash/releases/download/v${PV}/${P}.tar.gz"
+	SRC_URI="https://github.com/lanl/MPI-Bash/releases/download/v${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Parallel scripting right from the Bourne-Again Shell (Bash)"
-HOMEPAGE="https://github.com/losalamos/MPI-Bash"
+HOMEPAGE="https://github.com/lanl/MPI-Bash"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/app-shells/mpibash/mpibash-9999.ebuild b/app-shells/mpibash/mpibash-9999.ebuild
index 35d89c65384d8..986802067491a 100644
--- a/app-shells/mpibash/mpibash-9999.ebuild
+++ b/app-shells/mpibash/mpibash-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,17 +7,17 @@ EAPI=5
 inherit autotools-utils multilib
 
 if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="git://github.com/losalamos/MPI-Bash.git https://github.com/losalamos/MPI-Bash.git"
+	EGIT_REPO_URI="git://github.com/lanl/MPI-Bash.git https://github.com/lanl/MPI-Bash.git"
 	inherit git-r3
 	KEYWORDS=""
 	AUTOTOOLS_AUTORECONF=1
 else
-	SRC_URI="https://github.com/losalamos/MPI-Bash/releases/download/v${PV}/${P}.tar.gz"
+	SRC_URI="https://github.com/lanl/MPI-Bash/releases/download/v${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Parallel scripting right from the Bourne-Again Shell (Bash)"
-HOMEPAGE="https://github.com/losalamos/MPI-Bash"
+HOMEPAGE="https://github.com/lanl/MPI-Bash"
 
 LICENSE="GPL-3"
 SLOT="0"