diff --git a/dev-python/iniparse/iniparse-0.4-r1.ebuild b/dev-python/iniparse/iniparse-0.4-r1.ebuild
index 8c6e7303a4099..37fccc9c790ca 100644
--- a/dev-python/iniparse/iniparse-0.4-r1.ebuild
+++ b/dev-python/iniparse/iniparse-0.4-r1.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$
 
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Better INI parser for Python"
-HOMEPAGE="https://code.google.com/p/iniparse https://pypi.python.org/pypi/iniparse"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
+HOMEPAGE="https://pypi.python.org/pypi/iniparse"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT PSF-2"
 SLOT="0"
diff --git a/dev-python/iniparse/iniparse-0.4-r2.ebuild b/dev-python/iniparse/iniparse-0.4-r2.ebuild
index 1a181b41e26ec..c7fa11863527a 100644
--- a/dev-python/iniparse/iniparse-0.4-r2.ebuild
+++ b/dev-python/iniparse/iniparse-0.4-r2.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="Better INI parser for Python"
-HOMEPAGE="https://code.google.com/p/iniparse https://pypi.python.org/pypi/iniparse"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz"
+HOMEPAGE="https://pypi.python.org/pypi/iniparse"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT PSF-2"
 SLOT="0"
diff --git a/dev-python/iniparse/metadata.xml b/dev-python/iniparse/metadata.xml
index b54bedce9b52e..7f4f33c6dbc92 100644
--- a/dev-python/iniparse/metadata.xml
+++ b/dev-python/iniparse/metadata.xml
@@ -5,7 +5,4 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="google-code">iniparse</remote-id>
-	</upstream>
 </pkgmetadata>