diff --git a/dev-cpp/gflags/gflags-9999.ebuild b/dev-cpp/gflags/gflags-9999.ebuild
index d80a4fa437a30..aba9ef3c3996b 100644
--- a/dev-cpp/gflags/gflags-9999.ebuild
+++ b/dev-cpp/gflags/gflags-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
 
 EAPI="5"
@@ -7,9 +7,9 @@ inherit cmake-multilib
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://code.google.com/p/gflags/"
+	EGIT_REPO_URI="https://github.com/gflags/gflags.git"
 else
-	SRC_URI="https://github.com/schuhschuh/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/gflags/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
diff --git a/dev-cpp/gflags/metadata.xml b/dev-cpp/gflags/metadata.xml
index 6242b341b9249..5b9d6abf02a24 100644
--- a/dev-cpp/gflags/metadata.xml
+++ b/dev-cpp/gflags/metadata.xml
@@ -5,7 +5,6 @@
     <email>amynka@gentoo.org</email>
   </maintainer>
   <upstream>
-    <remote-id type="google-code">gflags</remote-id>
-    <remote-id type="github">schuhschuh/gflags</remote-id>
+    <remote-id type="github">gflags/gflags</remote-id>
   </upstream>
 </pkgmetadata>