diff --git a/app-misc/querypkg/Manifest b/app-misc/querypkg/Manifest
index cbe8afc6c..f99b92a99 100644
--- a/app-misc/querypkg/Manifest
+++ b/app-misc/querypkg/Manifest
@@ -1 +1 @@
-EBUILD querypkg-1.13.ebuild 535 RMD160 31c53ce35b3bf2fd63ea245d4f7ae2193d982b24 SHA1 195ea25040a3f131d01135cc0defa1790d9c4126 SHA256 3f402d0a0cb96ae97c824a076dce80f9c7bf883a6a7b6167a21629aefd2fd9e4
+EBUILD querypkg-2.0.ebuild 508 RMD160 7dc391a31bba156e4a71848318cefefcea4d7ae1 SHA1 c98f7e3ef225bea14c9c3ab3f90b28073b064d49 SHA256 f52fc7a8148ebad2aeffbb790fac97ab7b4bb93e01e5219b879524fe9e3eb37b
diff --git a/app-misc/querypkg/querypkg-1.13.ebuild b/app-misc/querypkg/querypkg-2.0.ebuild
similarity index 76%
rename from app-misc/querypkg/querypkg-1.13.ebuild
rename to app-misc/querypkg/querypkg-2.0.ebuild
index ab68028c6..b07828325 100644
--- a/app-misc/querypkg/querypkg-1.13.ebuild
+++ b/app-misc/querypkg/querypkg-2.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=4
 EGIT_REPO_URI="git://github.com/Enlik/querypkg.git"
 EGIT_COMMIT="v${PV}"
-inherit git-2
+inherit perl-module git-2
 
 DESCRIPTION="A simple CLI interface to packages.sabayon.org"
 HOMEPAGE="http://github.com/Enlik/querypkg/"
@@ -19,9 +19,6 @@ RDEPEND=">=dev-lang/perl-5.10
 	dev-perl/JSON-XS
 	dev-perl/URI
 	dev-perl/libwww-perl"
-DEPEND=""
+DEPEND="${RDEPEND}"
 
-src_install() {
-	newbin "${PN}.pl" "${PN}"
-	dodoc "README"
-}
+SRC_TEST=do