diff --git a/www-apps/froxlor/Manifest b/www-apps/froxlor/Manifest
index a59e66f..7d7571b 100644
--- a/www-apps/froxlor/Manifest
+++ b/www-apps/froxlor/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX aliases 820 RMD160 c4c86731b7b8337890677093267c52ea4805af84 SHA1 ce782e4207d50d71446cbe483e5d2b7e99968487 SHA256 809990aeef45ae1c1e46f484b397d6e4b683166fcd55608a0b0efdfb7e6e12ef
 AUX domainkey.conf 102 RMD160 7cf298411682321f4f9b97fee313668767a1301e SHA1 ad9a8bb7be54b6fc15c6db6140b11ffd9b4894ae SHA256 30c86dd638888eb92456fd053e25a86b6df7a025f3972e6dc5976d10347a6524
 AUX froxlor.cron 255 RMD160 a506d5165dff33b1a9c3b466441139af73921709 SHA1 bb0d4d5fb6128598883b97babaa4b2a83bd1fdbb SHA256 5a4ff57d65b563d32f1da76726f3fafc3e45cba956e357d7bc7dfe48693edb3d
 AUX php-fcgi-starter 226 RMD160 feeb05480f03b357030a73c1192ecfc08598b2b5 SHA1 8dad00ef853d0a0fb1800d231f2f0309e8c3d44f SHA256 1ce8e33e7c89172d24bc95eba804f871c6a72ea7739e3084198d835544ca0535
 AUX php.ini 1765 RMD160 678be9f350668bca899c6dac5fce5c9fe074b28b SHA1 564634c696e38b2b51352e85f9954b66844c46f9 SHA256 b8efce5d40dec9ae0361f7cf0314169c32b68f7cc130f5e1a11093b7d54affa5
-DIST froxlor-0.9.19.tar.gz 1167758 RMD160 a6a4d70507f5ab18b9583e4c3fd32ef2a3bc6102 SHA1 4131620f4312509dc423f040c693a93ae6d7de81 SHA256 5cad2b849562aa2789ed43697c2aa12dacef5ecad69de0747ba3a84cf6bbec48
-EBUILD froxlor-0.9.19.ebuild 56714 RMD160 d00ceed61468e52f1183c5c281d59b95c11f4011 SHA1 280125ee57d9b5ae9779c9e93cbaff2a743982f3 SHA256 da304a765f1d5707668d2e51ca85dd8437a9ffab7535c01d8ff6ddf4d2430b5f
-EBUILD froxlor-9999.ebuild 56731 RMD160 d62aa88b1a959ee923733af6456991c9068d38d6 SHA1 a23403e9f1809fdc148f9612d50f338cecb18615 SHA256 e63fe80ab420ca42cc481e7babe31f2c21df1a00772883441731cfb6650d9716
+DIST froxlor-0.9.24.tar.gz 1426944 RMD160 f140caf5fc2654fe3f867677b5ff344b19811a12 SHA1 37ee3b8bd8aff2b18e5d933e9729fe437d81eee8 SHA256 586ca2819c29ea759f601d03d7a4256a01026d4c3865226f2e091a94be24eb01
+EBUILD froxlor-0.9.24.ebuild 56693 RMD160 f3b0f74516f3243717f32dab98a2d487f26d2287 SHA1 c83109b6d983d084808a8f0ff7b1da935fa00e37 SHA256 08698ce93bd69c51224e989d63531c7d70d7b39819dc8f3b25a5ba2148449963
+EBUILD froxlor-9999.ebuild 56693 RMD160 f3b0f74516f3243717f32dab98a2d487f26d2287 SHA1 c83109b6d983d084808a8f0ff7b1da935fa00e37 SHA256 08698ce93bd69c51224e989d63531c7d70d7b39819dc8f3b25a5ba2148449963
 MISC ChangeLog 8210 RMD160 4799fcbefc22f244024d031c250713206bed5e95 SHA1 a1f12d134b321f6bdedd9f0010b2d3941b675b08 SHA256 2e4a770cb2b8aaf9ae3a010a6a59174ed49ffe921d1f645d39c5bc335557971e
-MISC metadata.xml 1423 RMD160 d984046adac16b95ecb18ec6e6cf342c93edda8b SHA1 3c0bf9cbc15aee33d206fb446c434b36d551a44d SHA256 846275c47bdfbf06e3d4e199c2ecd046848807153e477e03e53bf60ca58e7506
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk2uz04ACgkQ9rSocE+em7zQaAD8C7HGjRbCmO9/ivf5TUo9ClLV
-UkxeeMZjyG/I4cu4ECQBAJaPqWvayi7TCAHKRe5c6uRUFCob8UrsxxaSvwbo0sxm
-=K33r
------END PGP SIGNATURE-----
+MISC metadata.xml 1402 RMD160 0d90a92a8e3f27b3c7f0eb51380b668f460f4d76 SHA1 2e23b043835c5fc40e131ccbb59f9309379593a4 SHA256 56ff2ad314874127dc404ec42450ad4e3fcfddbc0ca16ce98cb71ad10157661b
diff --git a/www-apps/froxlor/froxlor-0.9.19.ebuild b/www-apps/froxlor/froxlor-0.9.24.ebuild
similarity index 99%
rename from www-apps/froxlor/froxlor-0.9.19.ebuild
rename to www-apps/froxlor/froxlor-0.9.24.ebuild
index fce4e26..08b084a 100644
--- a/www-apps/froxlor/froxlor-0.9.19.ebuild
+++ b/www-apps/froxlor/froxlor-0.9.24.ebuild
@@ -4,17 +4,19 @@
 
 EAPI="2"
 
-inherit eutils depend.php
+[[ ${PV} == 9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.froxlor.org/froxlor.git"
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.froxlor.org/froxlor.git"
-	EGIT_PROJECT="froxlor"
-	inherit git
-	#KEYWORDS=""
-else
+inherit eutils depend.php ${SCM}
+
+if [[ ${PV} != "9999" ]] ; then
 	RESTRICT="mirror"
 	SRC_URI="http://files.froxlor.org/releases/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI=""
+	KEYWORDS=""
+
 fi
 
 DESCRIPTION="A PHP-based webhosting-oriented control panel for servers."
@@ -67,7 +69,7 @@ DEPEND="
 		)
 	)
 	fcgid? ( >=dev-lang/php-5.2[cgi]
-		|| ( <dev-lang/php-5.3[force-cgi-redirect] >=dev-lang/php-5.3 )
+		|| ( >=dev-lang/php-5.3 )
 		 sys-auth/libnss-mysql
 			( !lighttpd? (
 				!nginx? (
@@ -240,7 +242,7 @@ src_install() {
 
 		einfo "Checking for directory /etc/php/fpm-php5.3/fpm.d/"
 		if [ ! -d /etc/php/fpm-php5.3/fpm.d/ ]; then
-			didir "/etc/php/fpm-php5.3/fpm.d/"
+			dodir "/etc/php/fpm-php5.3/fpm.d/"
 		fi
 
 		einfo "Creating tmp-directory"
diff --git a/www-apps/froxlor/froxlor-9999.ebuild b/www-apps/froxlor/froxlor-9999.ebuild
index 82ebf08..08b084a 100644
--- a/www-apps/froxlor/froxlor-9999.ebuild
+++ b/www-apps/froxlor/froxlor-9999.ebuild
@@ -69,7 +69,7 @@ DEPEND="
 		)
 	)
 	fcgid? ( >=dev-lang/php-5.2[cgi]
-		|| ( <dev-lang/php-5.3[force-cgi-redirect] >=dev-lang/php-5.3 )
+		|| ( >=dev-lang/php-5.3 )
 		 sys-auth/libnss-mysql
 			( !lighttpd? (
 				!nginx? (
@@ -242,7 +242,7 @@ src_install() {
 
 		einfo "Checking for directory /etc/php/fpm-php5.3/fpm.d/"
 		if [ ! -d /etc/php/fpm-php5.3/fpm.d/ ]; then
-			didir "/etc/php/fpm-php5.3/fpm.d/"
+			dodir "/etc/php/fpm-php5.3/fpm.d/"
 		fi
 
 		einfo "Creating tmp-directory"
diff --git a/www-apps/froxlor/metadata.xml b/www-apps/froxlor/metadata.xml
index e4a6b92..77a4abc 100644
--- a/www-apps/froxlor/metadata.xml
+++ b/www-apps/froxlor/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
 <maintainer>
   <email>release@froxlor.org</email>
     <description>Upstream Maintainer</description>