diff --git a/dev-python/Babel/Babel-2.5.0.ebuild b/dev-python/Babel/Babel-2.5.0.ebuild
index 7c0fc25e2672e..f764c52dc9839 100644
--- a/dev-python/Babel/Babel-2.5.0.ebuild
+++ b/dev-python/Babel/Babel-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.edgewall.org/ https://pypi.org/project/Babel/"
+HOMEPAGE="http://babel.pocoo.org/ https://pypi.org/project/Babel/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/Babel/Babel-2.5.3-r1.ebuild b/dev-python/Babel/Babel-2.5.3-r1.ebuild
index 885bd920bcb56..bbc2fbebb31ff 100644
--- a/dev-python/Babel/Babel-2.5.3-r1.ebuild
+++ b/dev-python/Babel/Babel-2.5.3-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.edgewall.org/ https://pypi.org/project/Babel/"
+HOMEPAGE="http://babel.pocoo.org/ https://pypi.org/project/Babel/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/Babel/Babel-2.5.3.ebuild b/dev-python/Babel/Babel-2.5.3.ebuild
index 760a35531d9b1..f056341ba2462 100644
--- a/dev-python/Babel/Babel-2.5.3.ebuild
+++ b/dev-python/Babel/Babel-2.5.3.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.edgewall.org/ https://pypi.org/project/Babel/"
+HOMEPAGE="http://babel.pocoo.org/ https://pypi.org/project/Babel/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/Babel/metadata.xml b/dev-python/Babel/metadata.xml
index a498ec71cd622..4f8d2872452f6 100644
--- a/dev-python/Babel/metadata.xml
+++ b/dev-python/Babel/metadata.xml
@@ -16,5 +16,7 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">Babel</remote-id>
+		<remote-id type="github">python-babel/babel</remote-id>
+		<bugs-to>https://github.com/python-babel/babel/issues</bugs-to>
 	</upstream>
 </pkgmetadata>