diff --git a/metadata/layout.conf b/metadata/layout.conf
index b87609f..7c1d706 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -1,7 +1,7 @@
 # we inerhit eclasses from gentoo
 masters = gentoo
 
-# This goes live after stabilization of portage-2.1.10.21
+# This goes live after stabilization of portage-2.1.10.51 (fixes bug #406407)
 manifest-hashes = SHA256 SHA512 WHIRLPOOL
 
 # Bug #337853 - gentoo's council says to enable
@@ -19,8 +19,7 @@ thin-manifests = true
 # directory
 profile-formats = pms
 
-# we are on git, so we can use a fancy cache format
-# when portage-2.1.10.29 was stable for a while.
-# it defaults to pms currently. (and we currently don't distribute
-# cache anyway)
-#cache-formats = md5-dict
+# Make egencache generate newer (more reliable)
+# md5-dict cache format (see bug #409445).
+# NOTE: list md5-dict first so clients prefer it
+cache-formats = md5-dict pms
diff --git a/www-apps/froxlor/Manifest b/www-apps/froxlor/Manifest
index 695806f..6b5d368 100644
--- a/www-apps/froxlor/Manifest
+++ b/www-apps/froxlor/Manifest
@@ -1 +1 @@
-DIST froxlor-0.9.26.tar.gz 1602312 RMD160 a105c5439c50b6624785f5469d55892f84e7fe8f SHA1 6e85f8bac27bd715d642547949c5ac9f84d18e23 SHA256 99c47a7127d672778e898e1916b0a1be74378ae7694669bb9c01f4b887951e5c
+DIST froxlor-0.9.27.tar.gz 1662621 SHA256 0468811f545d93ca98e9346e4c207b57fbbcd7669fa4435cb37cf046e2e3c031 SHA512 52ef7dd8a8bfd0ea3feeb773636671b7856194385537b6828cf0d806a7aa11136e4d37ac8bd659cf4fa2f0171ad1e7aae1e491afe025ed2296e22d35bba0aaf0 WHIRLPOOL 2b1c2a547bd58a87ae90be590a2930df6d5fe9c507e1ee2ee380381be3f4697aecf70f33334d5efe705ea873e4adfe79cfab0a10b3aac792c4999fce381bc12f
diff --git a/www-apps/froxlor/froxlor-0.9.26.ebuild b/www-apps/froxlor/froxlor-0.9.27.ebuild
similarity index 99%
rename from www-apps/froxlor/froxlor-0.9.26.ebuild
rename to www-apps/froxlor/froxlor-0.9.27.ebuild
index b2f75ee..6e01534 100644
--- a/www-apps/froxlor/froxlor-0.9.26.ebuild
+++ b/www-apps/froxlor/froxlor-0.9.27.ebuild
@@ -5,9 +5,10 @@
 EAPI="2"
 
 [[ ${PV} == 9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.froxlor.org/froxlor.git"
+EGIT_REPO_URI="https://github.com/Froxlor/Froxlor.git"
+EGIT_PROJECT="froxlor"
 
-inherit eutils depend.php ${SCM}
+inherit eutils ${SCM}
 
 if [[ ${PV} != "9999" ]] ; then
 	RESTRICT="mirror"
@@ -23,7 +24,7 @@ DESCRIPTION="A PHP-based webhosting-oriented control panel for servers."
 HOMEPAGE="http://www.froxlor.org/"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aps autoresponder awstats bind domainkey dovecot fcgid ftpquota fpm lighttpd +log mailquota nginx pureftpd ssl +tickets"
+IUSE="aps autoresponder awstats bind domainkey dovecot fcgid ftpquota fpm lighttpd +log mailquota nginx pureftpd quota ssl +tickets"
 
 DEPEND="
 	!www-apps/syscp
@@ -31,7 +32,6 @@ DEPEND="
 	virtual/cron
 	virtual/mysql
 	>=dev-lang/php-5.2[bcmath,cli,ctype,filter,ftp,gd,mysql,nls,pcntl,posix,session,simplexml,ssl=,tokenizer,xml,xsl,zlib]
-	|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
 	pureftpd? (
 		net-ftp/pure-ftpd[mysql,ssl=]
 	)
@@ -60,8 +60,7 @@ DEPEND="
 			)
 		)
 	)
-	fcgid? ( >=dev-lang/php-5.2[cgi]
-		|| ( >=dev-lang/php-5.3 )
+	fcgid? ( dev-lang/php[cgi]
 		 sys-auth/libnss-mysql
 			( !lighttpd? (
 				!nginx? (
@@ -80,7 +79,8 @@ DEPEND="
 		    >=mail-mta/postfix-2.4[sasl]
 	)
 	aps? ( dev-lang/php[zip] )
-	mailquota? ( >=mail-mta/postfix-2.4[vda] )"
+	mailquota? ( >=mail-mta/postfix-2.4[vda] )
+	quota? ( sys-fs/quotatool )"
 
 RDEPEND="${DEPEND}"
 
@@ -93,9 +93,6 @@ done
 # lets check user defined variables
 FROXLOR_DOCROOT="${FROXLOR_DOCROOT:-/var/www}"
 
-need_php5_httpd
-need_php5_cli
-
 S="${WORKDIR}/${PN}"
 
 src_unpack() {
diff --git a/www-apps/froxlor/froxlor-9999.ebuild b/www-apps/froxlor/froxlor-9999.ebuild
index 6e01534..1ec1bb8 100644
--- a/www-apps/froxlor/froxlor-9999.ebuild
+++ b/www-apps/froxlor/froxlor-9999.ebuild
@@ -31,7 +31,7 @@ DEPEND="
 	>=mail-mta/postfix-2.4[mysql,ssl=]
 	virtual/cron
 	virtual/mysql
-	>=dev-lang/php-5.2[bcmath,cli,ctype,filter,ftp,gd,mysql,nls,pcntl,posix,session,simplexml,ssl=,tokenizer,xml,xsl,zlib]
+	>=dev-lang/php-5.3[bcmath,cli,ctype,filter,ftp,gd,mysql,nls,pcntl,posix,session,simplexml,ssl=,tokenizer,xml,xsl,zlib]
 	pureftpd? (
 		net-ftp/pure-ftpd[mysql,ssl=]
 	)