diff --git a/app-portage/virtual-appliance/Manifest b/app-portage/virtual-appliance/Manifest
index c0ba44a..d7de68c 100644
--- a/app-portage/virtual-appliance/Manifest
+++ b/app-portage/virtual-appliance/Manifest
@@ -2,3 +2,4 @@ AUX addparams-0.9.1.diff 6756 SHA256 d384ef312af31c3bb16e71d27a3b6f1c5d36fefe393
 AUX varconfpath-0.9.1.diff 409 SHA256 49cde0194d2a22f5b661c28158babed8e5b576df1804bde5a4028e190fa1614d SHA512 2c6118269e9a08cd0533989a57b036977ca6c2579aae2904790645efa95ec87ee9c7affe3b961159a652756122f92b04a1ef9d34b6a55e1e35902f39e8be487e WHIRLPOOL 69b0c3c92aea233405bda4c49a3b418adcb422b571181fc831388e11f6b2186be1c2c84fb4fdc30f5464d13eab592a1db6c7663f8fe7517790a3759505ec981a
 DIST virtual-appliance-0.9.1.tar.bz2 49846 SHA256 f0a78d83f3e0e772d5a296b50b2fee93fb7f8271509b12fbc610d736a4710f73 SHA512 1db8eac5b80bde25842b612f077c40b5e8a9631294ca80a5cf663ed1023f5cd70b57a56801c627120f0915402eef6ce8bf7d92126550ce39f3bde5c6925cba99 WHIRLPOOL 5a7cfef86e698e88e9636280d0debae415f2d2d5947837b8af825a1913ae415ddecc2b7269db12914c119a122f02364c0bbb81b9acba37e24c77fe806970f953
 EBUILD virtual-appliance-0.9.1.ebuild 1062 SHA256 229e607d1e9256ac698cde814ace83130828a9ca9f7cf9a2c9ff829ff8e5effd SHA512 28bf6b5d00d2c2f0df1e81fd318bee825fafcd11a0ff7a87a468f245b8917b4fb635c71fedb6ef642fc3b3fb0194e0d80ae11ee73cca61f2c427335fc254990d WHIRLPOOL 9a728ed7fc42038d516119eefafe77645c5ad6a677b77c2bc8ea1d8333e601324820180c2e436f843363d29c45c1f9cea338af0ee6abba33d132b33217f6c27c
+EBUILD virtual-appliance-2.0-r20160320.ebuild 1071 SHA256 c0678df4719d43f1a7714b4a083aa5f3dfdf9858d9d7e90dbcb6acb90f21e8ca SHA512 eb3ff05ec1c77a7787a822875bf76a7f3482ed4958a5a4462e85e1f465921615b4024d2230653b501824b67cd7918bcf0c390b0e9f09b75fa7cd812f16b97b10 WHIRLPOOL b8a33995c8837836c0f2e0381439d5e61027ae7ba3824823af11e0e60a46e9d84d5547a645e35e72c6cbc7753a968e57bdc4b722a2953077616a3dbf5217c7da
diff --git a/app-portage/virtual-appliance/virtual-appliance-2.0-r20160320.ebuild b/app-portage/virtual-appliance/virtual-appliance-2.0-r20160320.ebuild
new file mode 100644
index 0000000..adcf694
--- /dev/null
+++ b/app-portage/virtual-appliance/virtual-appliance-2.0-r20160320.ebuild
@@ -0,0 +1,53 @@
+# Copyright Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils linux-info toolchain-funcs mercurial
+
+MY_REV="5bcbcdb"       # checkout revision
+MY_USR="marduk"        # user name
+
+MY_P="${MY_USR}-${PN}-${MY_REV}"
+
+DESCRIPTION="Programatically (re)create Gentoo Virtual Appliances"
+HOMEPAGE="https://bitbucket.org/marduk/virtual-appliance/wiki/Home"
+EHG_REPO_URI="https://bitbucket.org/${MY_USR}/${PN}"
+EHG_REVISION=${MY_REV}
+
+LICENSE="unknown"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-emulation/qemu
+        sys-block/parted"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="BLK_DEV_NBD"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	rm .hg_archival.txt
+	rm .hgignore
+	rm .hgtags
+##	epatch ${FILESDIR}/varconfpath-${PV}.diff
+##	epatch ${FILESDIR}/addparams-${PV}.diff
+}
+
+src_compile() {
+	einfo "Nothing to compile"
+}
+
+src_install() {
+	insinto /opt/${PN}
+	cp -r . ${D}/opt/${PN}
+
+	echo "CONFIG_PROTECT=\"/opt/${PN}/configs\"" > "${T}"/99${PN}
+	doenvd "${T}"/99${PN}
+}