diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 9903f497..92965270 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -1,2 +1,4 @@
 DIST vala-0.19.0.tar.xz 2617496 SHA256 7781c8cb5416c10ba53ccf6b216966ba864fee71bb26d23ffaef29cb2011c5ee SHA512 8794ab66fae186f288a8606fab36d12bd58a82c366a1268ebdc87531d5fa6c3dc3a2797a2870fe78b9ac8b48c01cda81ddd48de94c648e99654594743b5d22e2 WHIRLPOOL 9595801cbffaa530528635bc922200828de05a29d97ecd8e0e126b3d7e44186bab31d5551a1bbc5197e901a7e4ffef46c246bae24f574fb7b8cb19d69942dba5
+DIST vala-0.20.0.tar.xz 2626728 SHA256 2c464ff5b567861b3116602891ff83439e570ce42d7c9b3b76e36adc17f2848c SHA512 4b107b7fb962d1f31cd797f7b6c44162c43876d85e318aa99dae9ca772f0ac2ceabd1b071c96d2e45ceb383b00e0b917ea3eb45b98e98a6e8d7b3b1a7c29edaa WHIRLPOOL 4afd140f625896f248d17f5f8b19c5f68106ec22eed66e75dce01b2536d566ac3feb50a4466cb3b764a3063e6bfc50e9eee347544cbfa3cb7073d601a1c85015
 EBUILD vala-0.19.0.ebuild 914 SHA256 1824667933ae568934b977398c16481ba8570f27fd376056083957996dcb11e1 SHA512 6acdd58d3608a9d49e3f38af474285390a15dca75795effd31850988a016138df0fed9190e9a526d92a509062b2e15155e3560fbb165af177ed02b42472ac578 WHIRLPOOL 6373b1e760d02d0b0c9e7086c4314d4825ff609f5d58c0c898508020881dd5bcc578f4bfe4da8d9ba2c45aeaed1cd0e6204c98e773a949b37f30848036c51cc2
+EBUILD vala-0.20.0.ebuild 914 SHA256 80e175afb5d03e80eef2c7338c3b9353fc5e62920b9146382521247f2575ef67 SHA512 2b26005d0cf64e6f92621587c1f3bdcc1d8b808c2ff390c48c6bfc48ba6b8737991e5a40deec244a8ca68db3d982cf2a2848f96b9c4261b62bfbbd7f38221b66 WHIRLPOOL e0cb730c71a9cf2b83cdfedb2186a4c59b8f72fc407bcecdfc8f16b13bd0f461779290c04c17071b52b173beee412c5869e67f83e2ee58718668ce68f0dec8d2
diff --git a/dev-lang/vala/vala-0.20.0.ebuild b/dev-lang/vala/vala-0.20.0.ebuild
new file mode 100644
index 00000000..28b93e6a
--- /dev/null
+++ b/dev-lang/vala/vala-0.20.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.20.0.ebuild,v 1.2 2013/02/21 18:40:06 zmedico Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Vala - Compiler for the GObject type system"
+HOMEPAGE="http://live.gnome.org/Vala"
+
+LICENSE="LGPL-2.1"
+SLOT="0.20"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="test +vapigen"
+
+RDEPEND=">=dev-libs/glib-2.18:2
+	>=dev-libs/vala-common-${PV}"
+DEPEND="${RDEPEND}
+	!${CATEGORY}/${PN}:0
+	dev-libs/libxslt
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+	test? (
+		dev-libs/dbus-glib
+		>=dev-libs/glib-2.26:2 )"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+	G2CONF="${G2CONF}
+		--disable-unversioned
+		$(use_enable vapigen)"
+}
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index e5cd7236..5691b93f 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,2 +1,4 @@
 DIST vala-0.19.0.tar.xz 2617496 SHA256 7781c8cb5416c10ba53ccf6b216966ba864fee71bb26d23ffaef29cb2011c5ee SHA512 8794ab66fae186f288a8606fab36d12bd58a82c366a1268ebdc87531d5fa6c3dc3a2797a2870fe78b9ac8b48c01cda81ddd48de94c648e99654594743b5d22e2 WHIRLPOOL 9595801cbffaa530528635bc922200828de05a29d97ecd8e0e126b3d7e44186bab31d5551a1bbc5197e901a7e4ffef46c246bae24f574fb7b8cb19d69942dba5
+DIST vala-0.20.0.tar.xz 2626728 SHA256 2c464ff5b567861b3116602891ff83439e570ce42d7c9b3b76e36adc17f2848c SHA512 4b107b7fb962d1f31cd797f7b6c44162c43876d85e318aa99dae9ca772f0ac2ceabd1b071c96d2e45ceb383b00e0b917ea3eb45b98e98a6e8d7b3b1a7c29edaa WHIRLPOOL 4afd140f625896f248d17f5f8b19c5f68106ec22eed66e75dce01b2536d566ac3feb50a4466cb3b764a3063e6bfc50e9eee347544cbfa3cb7073d601a1c85015
 EBUILD vala-common-0.19.0.ebuild 2614 SHA256 bc3271e2ae1e08b864805f76bdb440334d17b8ad5bd1a7777561275102aab863 SHA512 ca7c70d62d73e0f5d5648f823870679bf6336b5ecdc3e0c32cd8120a81ec5f3892e8576956775310ea6d2f8881bd203d9769143e00fb43bcdffe7be8b478b964 WHIRLPOOL f7a1ff4ae6340760b21d4c1737954762269d1bce81fd43805d3aa813148eea20ed122a8064f62e4cb761d8e5dacab1e2da8e170c17e3efe7079deac66ad23924
+EBUILD vala-common-0.20.0.ebuild 2614 SHA256 0af90082470acb8eee6b585cf7fc2fac7e3f8f8c9e1636b0e1bf85cba7b586b0 SHA512 12d1ce3e04b5f7d6c6aff10e05845b4d75f8e072b1b313a449ce1dd74e1d632da6281d02113dcf8b76e790fc59be5895e499f8196ab7c475e79973c45a3a5b52 WHIRLPOOL fc64be1dcf5966218eceadf4e00f2d780d1db01dc05c470e4f5426a4085a83ac8af103e2b630ce63d92de805acae35bd9052a1707b33eabd1d5ae8ce33c96b94
diff --git a/dev-libs/vala-common/vala-common-0.20.0.ebuild b/dev-libs/vala-common/vala-common-0.20.0.ebuild
new file mode 100644
index 00000000..d72e2c39
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.20.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/vala-common/vala-common-0.20.0.ebuild,v 1.2 2013/02/18 01:24:02 zmedico Exp $
+
+EAPI="4"
+GNOME_ORG_MODULE="vala"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for packages that use Vala"
+HOMEPAGE="http://live.gnome.org/Vala"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+# Previously ${PN} was part of dev-lang/vala
+RDEPEND="!<dev-lang/vala-0.10.4-r2
+	!<dev-lang/vala-0.12.1-r1:0.12
+	!<dev-lang/vala-0.14.2-r2:0.14
+	!<dev-lang/vala-0.16.1-r2:0.16
+	!<dev-lang/vala-0.17.5:0.20"
+DEPEND=""
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/aclocal
+	doins vala.m4 vapigen/vapigen.m4
+	insinto /usr/share/vala
+	doins vapigen/Makefile.vapigen
+}
+
+pkg_postinst() {
+	# Hack to prevent alternatives_auto_makesym in previously installed
+	# dev-lang/vala's pkg_postrm from overwriting vala-common's files
+	if has_version '<dev-lang/vala-0.10.4-r2:0.10' && [[ -f "${EROOT}usr/share/aclocal/vala-0-10.m4" ]]; then
+		ebegin "Removing old vala-0.10 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-18.m4" &> /dev/null
+		eend $?
+	fi
+	if has_version '<dev-lang/vala-0.12.1-r1:0.12' && [[ -f "${EROOT}usr/share/aclocal/vala-0-12.m4" ]]; then
+		ebegin "Removing old vala-0.12 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
+		eend $?
+	fi
+	if has_version '<dev-lang/vala-0.14.2-r2:0.14' && [[ -f "${EROOT}usr/share/aclocal/vala-0-14.m4" ]]; then
+		ebegin "Removing old vala-0.14 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
+		eend $?
+	fi
+	if has_version '<dev-lang/vala-0.16.1-r2:0.16' && [[ -f "${EROOT}usr/share/aclocal/vala-0-16.m4" ]]; then
+		ebegin "Removing old vala-0.16 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
+		eend $?
+		if [[ -f "${EROOT}usr/share/vala-0.16/Makefile.vapigen" ]]; then
+			ebegin "Removing old vala-0.16 makefile template"
+			rm "${EROOT}usr/share/vala-0.16/Makefile.vapigen" &> /dev/null
+			eend $?
+		fi
+	fi
+	if has_version '<dev-lang/vala-0.17.5:0.18' && [[ -f "${EROOT}usr/share/aclocal/vala-0-18.m4" ]]; then
+		ebegin "Removing old vala-0.18 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
+		eend $?
+		if [[ -f "${EROOT}usr/share/vala-0.18/Makefile.vapigen" ]]; then
+			ebegin "Removing old vala-0.18 makefile template"
+			rm "${EROOT}usr/share/vala-0.18/Makefile.vapigen" &> /dev/null
+			eend $?
+		fi
+	fi
+}