diff --git a/eclass/ubuntu-versionator.eclass b/eclass/ubuntu-versionator.eclass
index 004f36541..b20a2f57a 100644
--- a/eclass/ubuntu-versionator.eclass
+++ b/eclass/ubuntu-versionator.eclass
@@ -27,8 +27,8 @@ EXPORT_FUNCTIONS pkg_setup pkg_postinst
 
 ## vala.eclass ##
 # Set base sane vala version for all packages requiring vala, override in ebuild if or when specific higher versions are needed #
-export VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:=0.22}	# Needs to be >=${minimal_supported_minor_version} from vala.eclass
-export VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:=0.22}
+export VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:=0.26}	# Needs to be >=${minimal_supported_minor_version} from vala.eclass
+export VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:=0.26}
 export VALA_USE_DEPEND="vapigen"
 #---------------------------------------------------------------------------------------------------------------------------------#
 
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index f246863ea..e74d30abd 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -2,4 +2,4 @@ DIST shotwell-icons.tar.bz2 59644 SHA256 aaf4e1a03ba2d17edb24f1c35bc880573a6066d
 DIST shotwell.1 1238 SHA256 7f4036f14a6c599835bd121d63705ddc766388aae8c6414eb3a405c85b9a5014 SHA512 8090d5d339a44992d2543ba9ed1bb6e0eb18da8d3fe6ad4f95f917d3aca352e6af0b8c21a7da3a8be9aa1cb04a13e8602d9db8484d4801547cfadc6c40500ad4 WHIRLPOOL cb3c1ef3cb6a577fa94d0aec4dfc06ee84a1f77771268e3217704fed269cd0cd3c220a4e68d270c152b34dc2e438e193d47aee87dd891a39fd8236a6d269eb3b
 DIST shotwell_0.22.0+git20160108.r1.f2fb1f7-0ubuntu1.debian.tar.xz 244224 SHA256 a369f9f69654929b2b340490b10cb96264be34ea5557501662bb6152a7079757 SHA512 3f3c02007a5b47b8b9318336b0ab2dbaa48f21d06a1e6d6c0b89598a9eb53de17d479e0d75ec5e9cf05417fcc8014fd51d21e38168359fb6b08b776caa884db9 WHIRLPOOL 2d40049b213702ba12a36bb5f4087a4b3253185f0019a3889a201a5462dbcbf7c4cde03537b5e0dbb5ff44fab02644f6fbc961cd10b1a7a15aedc7d0bf0087f1
 DIST shotwell_0.22.0.orig.tar.xz 1872952 SHA256 01b192c5c1c188ecd11bfdb6143d8f177f313c7eab7fe320bd20ac3ca352f831 SHA512 486f27a1fa06512a925ecae60504f3cbc487d44834f635efd0897dd20cb304a731c08133ab4b04b32a754235fc8c63dc9b05787b1a0c72a98c89ca91c64f452c WHIRLPOOL 8b93b6a92822c26aa7962f30e7402322371db1e6d297d7cd4e612f01f0418bcf2ee3598954e7d2a59d62f7e9704479bb24cb6fcf4263ab5315668c20543445c3
-EBUILD shotwell-0.22.0_p0_p01_p20160108.ebuild 3096 SHA256 2a81dc115b6972c25d03af03d8e379a3066092a75011f71e590daf8e5b3f91ed SHA512 585f220aef6163d2b90215da8c59fe3767efc6bdb896d0c2b94a76a8d1508ab4a920cbcb59169bd262e2f9ae8b5a81691081c7912c5ceeb14d2b9e1ed734a2f0 WHIRLPOOL 370ddd49e652f1d5d1e289dad2fa723b99a5d02b70c2cf9d52e4bba678fe63d136a6ce91900988aa47bd1b052816f688d710b486a439ae9f4ccd1603a918b406
+EBUILD shotwell-0.22.0_p0_p01_p20160108.ebuild 3040 SHA256 b0a559d2fa913cb637b7b31cb35c3b65a0d3cf448bf2e990a5445b6cc235f8a3 SHA512 46095ac5283467cc666db389d6b6e8eb3344ca4cd5010f3c56ecf3785de63ae0a38df1a653c1efb4f8d98f2397e0bd3188a9575a857c1cbb5d8ac7b63d1cf6c2 WHIRLPOOL 34d28bc74327067a8eadd60238d0ca875db6e378802d70fa1a8ead89799904c113cb48d60a5af381fc0a5eac2ae28fc847ce29226745607363188361741b0568
diff --git a/media-gfx/shotwell/shotwell-0.22.0_p0_p01_p20160108.ebuild b/media-gfx/shotwell/shotwell-0.22.0_p0_p01_p20160108.ebuild
index ed43921e5..1e32f16fb 100644
--- a/media-gfx/shotwell/shotwell-0.22.0_p0_p01_p20160108.ebuild
+++ b/media-gfx/shotwell/shotwell-0.22.0_p0_p01_p20160108.ebuild
@@ -3,8 +3,6 @@
 # $Id$
 
 EAPI=6
-VALA_MIN_API_VERSION="0.26"
-VALA_MAX_API_VERSION="0.26"
 
 URELEASE="xenial"
 inherit eutils gnome2-utils multilib toolchain-funcs vala ubuntu-versionator
diff --git a/profiles/xenial/unity-portage.pkeywords b/profiles/xenial/unity-portage.pkeywords
index dfc9346aa..d1167ffae 100644
--- a/profiles/xenial/unity-portage.pkeywords
+++ b/profiles/xenial/unity-portage.pkeywords
@@ -30,9 +30,6 @@ dev-util/umockdev
 ~media-libs/glm-0.9.5.1
 ~media-libs/harfbuzz-0.9.35
 ~media-libs/libpng-1.6.18
-=media-libs/phonon-4.8*			# Phonon versions needed to compile using >=qt-5.4.2 (see https://git.reviewboard.kde.org/r/123874/)
-=media-libs/phonon-gstreamer-4.8*
-=media-libs/phonon-vlc-0.8*
 =net-misc/networkmanager-1.2*
 sys-devel/automake:1.14
 sys-devel/gcc:5.3.0
diff --git a/profiles/xenial/unity-portage.pmask b/profiles/xenial/unity-portage.pmask
index a769559c1..166fd01a5 100644
--- a/profiles/xenial/unity-portage.pmask
+++ b/profiles/xenial/unity-portage.pmask
@@ -1,9 +1,5 @@
 ## Global masks ##
 
->=media-libs/phonon-4.9		# Phonon >=4.9 requires >qtwebkit-4.10.4 but Gentoo has this hardmasked for testing
->=media-libs/phonon-gstreamer-4.9
->=media-libs/phonon-vlc-0.9.0
-
 # xapian-1.3 is the development release which appends it's version to all includes/libs (see related b.g.o #480470)
 #   xapian{-bindings} versions must match
 >=dev-libs/xapian-1.3
diff --git a/profiles/yakkety/unity-portage.pkeywords b/profiles/yakkety/unity-portage.pkeywords
index 6c9132125..029cb525c 100644
--- a/profiles/yakkety/unity-portage.pkeywords
+++ b/profiles/yakkety/unity-portage.pkeywords
@@ -29,9 +29,6 @@ dev-util/umockdev
 ~media-libs/glm-0.9.5.1
 ~media-libs/harfbuzz-0.9.35
 ~media-libs/libpng-1.6.18
-=media-libs/phonon-4.8*			# Phonon versions needed to compile using >=qt-5.4.2 (see https://git.reviewboard.kde.org/r/123874/)
-=media-libs/phonon-gstreamer-4.8*
-=media-libs/phonon-vlc-0.8*
 =net-misc/networkmanager-1.2*
 sys-devel/automake:1.14
 sys-devel/gcc:5.3.0
diff --git a/profiles/yakkety/unity-portage.pmask b/profiles/yakkety/unity-portage.pmask
index 894125575..fe3cdc580 100644
--- a/profiles/yakkety/unity-portage.pmask
+++ b/profiles/yakkety/unity-portage.pmask
@@ -1,9 +1,5 @@
 ## Global masks ##
 
->=media-libs/phonon-4.9	# Phonon >=4.9 requires >qtwebkit-4.10.4 but Gentoo has this hardmasked for testing
->=media-libs/phonon-gstreamer-4.9
->=media-libs/phonon-vlc-0.9.0
-
 # xapian-1.3 is the development release which appends it's version to all includes/libs (see related b.g.o #480470)
 #   xapian{-bindings} versions must match
 >=dev-libs/xapian-1.3