diff --git a/dev-python/scrapy/Manifest b/dev-python/scrapy/Manifest
index cc29754..47b67b4 100644
--- a/dev-python/scrapy/Manifest
+++ b/dev-python/scrapy/Manifest
@@ -1,2 +1,3 @@
 DIST Scrapy-0.16.2.tar.gz 675402 SHA256 8c74a37e5bcc836d1a4ee58104e8bcfe51b7af5ed2595d865d665bb725833fa1 SHA512 40d55230af764207452e2ac4b3b45037a14dc210a896863bac54ba0e2bc0e0606f56c93ca0de95f7a08e69782e69fc996d052378aa7b9d8193d5e8d7864e3670 WHIRLPOOL 0b3b3b39b2769caa3ddfc6f78c6047d78293340a6f80a2eb6266e78440630d3396798a4c1c540b83998a7488a8bd30bca73dc927bc58e07c20c96866112d42d2
-EBUILD scrapy-0.16.2.ebuild 1818 SHA256 10ada230ce3c2a5a494c54e64f6952c8401701e1d8542a35c356e8791dca8f8d SHA512 1cb2943e5ee89649c97b388b21b072cab98c2c33911b28a18e3b2e039886f0d82c2308d57987a018de922492988246162566423def88144c4499ad542607361b WHIRLPOOL 7ee28bfaab38435ecc259b94772df8d05c3a23475468feacbd49ec57a8f243bedc0a8b1a8ebbd58833f97b99b6948e97559c4c69dfb1384cb6f3c2b7fbb73977
+EBUILD scrapy-0.16.2.ebuild 1708 SHA256 5b76cf836e558e3fa711561c7228f5a0a7b86dd089c67b7268709a39114165f2 SHA512 569f93ca68920fe60fe114adddc05889d25e6f8f135f452664fb5cf2f14b19d3f7dad9a301630c7dbe3676182e7efa47015299961e1a463c8bcdd1716f1cd82d WHIRLPOOL 13fed208f0c4bd593c0a2fb5eccaf77eda52885bf7c6a32cc5e17c30f527fa931dc7098edf3bea4daf62ce1541e314b7396f436f7f3954765dbbe1a73b68617e
+MISC metadata.xml 415 SHA256 6cbf7bc902a788f3aca1fc94cb2451399e088a2f696f1d1a724c296505b54655 SHA512 9320286bb847c00d744e558da90f14ed9c2dc853bcadb32152b977fd4b28d2b6228aab5ed91a6ea23ad77a33d1c4713d7b7c17b8a33a8c1981267a2b9b30521a WHIRLPOOL e348fd491bfe49ede0792d9e88a8ba2caafdcd637a5403e19459c7774072cd197301fd7e95f204ebff20c02bbf8beb1516fc15990ae0a36e9439cac7d9871df0
diff --git a/dev-python/scrapy/metadata.xml b/dev-python/scrapy/metadata.xml
new file mode 100644
index 0000000..e7ca305
--- /dev/null
+++ b/dev-python/scrapy/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>python</herd>
+<maintainer>
+  <email>maksbotan@gentoo.org</email>
+</maintainer>
+<use>
+  <flag name="boto">Add support for Amazon S3 via
+  <pkg>dev-python/boto</pkg></flag>
+  <flag name="ibl">Use Instace Based Learning alrogirithm for automatic
+  extraction</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-python/scrapy/scrapy-0.16.2.ebuild b/dev-python/scrapy/scrapy-0.16.2.ebuild
index b0c1c04..6dc83f9 100644
--- a/dev-python/scrapy/scrapy-0.16.2.ebuild
+++ b/dev-python/scrapy/scrapy-0.16.2.ebuild
@@ -1,15 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/scrapy-0.14.4.ebuild,v 1.3 2012/08/09 06:22:27 patrick Exp $
 
-EAPI="4"
+EAPI="5"
 
-PYTHON_DEPEND="2"
 PYTHON_USE_WITH="sqlite(+)"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-pypy-*"
-PYTHON_TESTS_RESTRICTED_ABIS="2.5"
-inherit distutils
+PYTHON_COMPAT=(python{2_6,2_7})
+inherit distutils-r1
 
 MY_PN="Scrapy"
 MY_P="${MY_PN}-${PV}"
@@ -22,7 +19,6 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="boto doc examples ibl test ssl"
-PYTHON_MODNAME="scrapy scrapyd"
 
 DEPEND="dev-python/setuptools
 	doc? ( dev-python/sphinx )