diff --git a/www-apps/piwik/Manifest b/www-apps/piwik/Manifest
index 9b5fc7d..d611e7d 100644
--- a/www-apps/piwik/Manifest
+++ b/www-apps/piwik/Manifest
@@ -1,2 +1,5 @@
 DIST piwik-1.12.tar.gz 6822406 SHA256 b008dd452541af8051cdcf262a333937ba5c86af34e070932d378d256f03fba2 SHA512 a486078bb0e2a5b8069a83e0cd855d4a19ad161e383deac99b85884a2b1f7495650b0226077210505cc413426e8c2386e49b4542d3e9d866168abc018e5adab4 WHIRLPOOL afb33951c752cb40f7a21e48e79d815d370e5efdf2bb883ad2ae5ee1156306f2149445f5ba646f52926d473ead412a92168a5716d57f82752ea4cd0a7c4f5a31
-EBUILD piwik-1.12.ebuild 1151 SHA256 d0d73c87d6988369bc5af21c01c08ef6b08a2368a5940f0d2f0a80592532ddb1 SHA512 aef99eebe4d47aa7d0699638ddedc3674a256d3adf9c6bd071f83146423869dd837f68156475e4c33e174d6886ea3abc18b5d5a88509f89003b182db44e6d33e WHIRLPOOL eda68adcaf06d767769ef35dd37cf5cd5f392c2d57c34b5ec981bcd66990e1560047e7dc0e4c6fa9592dadc732628a1ffed82d9015973566a2e0dc4dc44d4170
+DIST piwik-2.0.tar.gz 7249723 SHA256 22d9d49dd2a8e6ae7070e262aa1a6ac974d1333e740f70014614dda21abef958 SHA512 f9e6dd7e76751a825509d158271929f6fbabccd0d4f05ee8dba7c3a2c9043872d128dc7f67b2028d475d7f964fd165884cbcdbeb7a3f527520c93cb6e9701e75 WHIRLPOOL 3771ac720b2c44fa1c2241c6f0ec746971d06cd78e829e88989b5d68a8e6853e3aad058ca8555b69e99cb361fb5f28fda99b6dc8e4555a6d6305e956512a84b8
+EBUILD piwik-1.12.ebuild 1153 SHA256 2670a04a14f4bab32454c101855f66d64cf5e7c209511f5b1927c7c8f47eaf64 SHA512 ec9a541827eed77f6e68b7c8209d270c2b13a590db53d49ee5445ca0d504dbb9fca5af3cf09cab01632a4f2180951b1237742ee3a560e3047a224c20d14a0786 WHIRLPOOL 9d980e85aa2576be36d1e17316ddd77b934021bfac252837b6b63033fe4a9964a119f93480c5cfac2c34f1621e761e8c1d11465b340e3032cfd65fac4e1046b9
+EBUILD piwik-2.0.ebuild 1153 SHA256 2670a04a14f4bab32454c101855f66d64cf5e7c209511f5b1927c7c8f47eaf64 SHA512 ec9a541827eed77f6e68b7c8209d270c2b13a590db53d49ee5445ca0d504dbb9fca5af3cf09cab01632a4f2180951b1237742ee3a560e3047a224c20d14a0786 WHIRLPOOL 9d980e85aa2576be36d1e17316ddd77b934021bfac252837b6b63033fe4a9964a119f93480c5cfac2c34f1621e761e8c1d11465b340e3032cfd65fac4e1046b9
+MISC metadata.xml 162 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 SHA512 550d0f517601255e5c9b120a03f1dad37a1a75bdaadad486ddbd2380a7f0dd884970400574455d34d3ba6e800d9fd21467dfb7f89ba27a0aa8a65e7a265534e3 WHIRLPOOL d50adcb067d0290aa7dfe5aebd0e8abf4939ece7afbf284920d08f2bf04f9306f0062a78cacb7572a12735ac41545440fcf138beda81cc53774950bdde495dcb
diff --git a/www-apps/piwik/metadata.xml b/www-apps/piwik/metadata.xml
new file mode 100644
index 0000000..6632069
--- /dev/null
+++ b/www-apps/piwik/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>web-apps</herd>
+</pkgmetadata>
diff --git a/www-apps/piwik/piwik-2.0.ebuild b/www-apps/piwik/piwik-2.0.ebuild
new file mode 100644
index 0000000..7c6587b
--- /dev/null
+++ b/www-apps/piwik/piwik-2.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit webapp depend.php
+
+DESCRIPTION="Piwik is a downloadable, open source (GPL licensed) real time web analytics software program."
+HOMEPAGE="http://www.piwik.org/"
+SRC_URI="http://builds.piwik.org/piwik-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE="gd geoip"
+
+DEPEND=""
+RDEPEND="dev-lang/php[pdo,ctype,xml] || ( <dev-lang/php-5.3[spl,reflection] >=dev-lang/php-5.3 )
+		 dev-lang/php[iconv,zlib]
+		 gd? ( dev-lang/php[gd] )
+		 geoip? ( dev-php/pecl-geoip )"
+
+need_httpd_cgi
+need_php_httpd
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	dodir "${MY_HTDOCSDIR}/"{tmp,config}
+	doins -r piwik/*
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}/"{tmp,config}
+	webapp_configfile "${MY_HTDOCSDIR}/config/"{global.ini.php,manifest.inc.php}
+	webapp_src_install
+	fperms -R 0660 "${MY_HTDOCSDIR}/"{tmp,config}
+}
+
+pkg_postinst() {
+	elog "Install and upgrade instructions can be found here:"
+	elog "  http://piwik.org/docs/installation-optimization/"
+	webapp_pkg_postinst
+}