diff --git a/dev-python/tinyurl/Manifest b/dev-python/tinyurl/Manifest
index 101c43141..0ae81149d 100644
--- a/dev-python/tinyurl/Manifest
+++ b/dev-python/tinyurl/Manifest
@@ -1 +1 @@
-DIST TinyUrl-0.1.0.tar.bz2 23465 SHA256 34278c31c2a32a5e5b858ba3a5af275445007e046f519c0f3a4b61c2bfd2dccb
+DIST TinyUrl-0.1.0.tar.bz2 23465 SHA256 34278c31c2a32a5e5b858ba3a5af275445007e046f519c0f3a4b61c2bfd2dccb SHA512 3198a02a74329c90b6daec4ab6fc1e117d67220d165c2b4c02f28b9c04c5ddb8284a87c5c9e1996b3f4b768a36fb7a253620458ed750e468f42748ca03a0d5ed WHIRLPOOL 9633fa27283def7a61b90c2dd596fefb4be653a32d2abbbb87834f9ca0494c56ea4770de9b548a93716088b6f2803c30efd1ed511dd1900e9b351daaa1973db8
diff --git a/dev-python/tinyurl/metadata.xml b/dev-python/tinyurl/metadata.xml
new file mode 100644
index 000000000..465837564
--- /dev/null
+++ b/dev-python/tinyurl/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lxnay@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+                <email>skullbocks@sabayon.org</email>
+        </maintainer>
+</pkgmetadata>
diff --git a/dev-python/tinyurl/tinyurl-0.1.0.ebuild b/dev-python/tinyurl/tinyurl-0.1.0.ebuild
index 73f1455b4..aa85e7f7a 100644
--- a/dev-python/tinyurl/tinyurl-0.1.0.ebuild
+++ b/dev-python/tinyurl/tinyurl-0.1.0.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
 
-EAPI="3"
-PYTHON_DEPEND="2"
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
 
-inherit distutils
+inherit distutils-r1
 
 MY_PN=TinyUrl
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Super tiny library and command-line interface to tinyurl.com"
-HOMEPAGE="http://meatballhat.com/projects/TinyUrl"
-SRC_URI="http://pypi.python.org/packages/source/T/${MY_PN}/${MY_P}.tar.bz2"
+HOMEPAGE="https://pypi.python.org/pypi/TinyUrl"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
@@ -22,5 +21,4 @@ IUSE="doc examples"
 DEPEND=""
 RDEPEND=""
 
-PYTHON_MODNAME="${MY_P}"
 S="${WORKDIR}/${MY_P}"