diff --git a/www-apps/froxlor/Manifest b/www-apps/froxlor/Manifest
index 8e94d2a..15a99d5 100644
--- a/www-apps/froxlor/Manifest
+++ b/www-apps/froxlor/Manifest
@@ -1 +1 @@
-DIST froxlor-0.9.38.7.tar.gz 1202009 SHA256 984cbbed772bcad57270134bd579726403cd53664f09ecf78fa10202a881fdf1 SHA512 8e979f8932c1d2f997dbf2dbddacdf29bc7bc45b147ed2b27a03ce91078e9060114053a99cfc321aeea21ec5e6a5a4251b83b50a5c130f3f326ddaa277f9a58a WHIRLPOOL d5245ae54d71d91d44512dfbe4f030748a0d164e1fce67ef074cf2fa7be8c0185fecd05af8d29b585187cda390a1b379bd702a32e4b69a5260aed3da7196932d
+DIST froxlor-0.9.40.1.tar.gz 1273381 SHA256 d7d0eea18dbfc6048b19953589199e29533f4d4d60622f468de41f899d9d6196 SHA512 383be339b1508838df1dba218cfbbe65d24d2f770ac698ba48d72b981f20bd64c73f296dc1cb77f0b822a1b83ee7ec2546bb5dd7db2343b292951e16f3b4564c WHIRLPOOL 73013aba351cf7e8bf51d17ebe52a42b284808f07a1f2a652870589d18e1a4c8f9f3e25dceeabf5151e985196093d2ce14bef5160ff22300ea097fbef8f620ce
diff --git a/www-apps/froxlor/froxlor-0.9.38.7.ebuild b/www-apps/froxlor/froxlor-0.9.40.1.ebuild
similarity index 97%
rename from www-apps/froxlor/froxlor-0.9.38.7.ebuild
rename to www-apps/froxlor/froxlor-0.9.40.1.ebuild
index 9809806..1c1378e 100644
--- a/www-apps/froxlor/froxlor-0.9.38.7.ebuild
+++ b/www-apps/froxlor/froxlor-0.9.40.1.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
-inherit eutils
+EAPI="7"
 
 if [[ ${PV} = "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Froxlor/Froxlor.git"
+	EGIT_BRANCH="0.9.x"
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${PN}
 	inherit git-r3
 	KEYWORDS=""
 else
 	RESTRICT="mirror"
-	SRC_URI="http://files.froxlor.org/releases/${P}.tar.gz"
+	SRC_URI="https://files.froxlor.org/releases/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="A PHP-based webhosting-oriented control panel for servers."
-HOMEPAGE="http://www.froxlor.org/"
+HOMEPAGE="https://www.froxlor.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,7 +26,6 @@ DEPEND="
 	!www-apps/syscp
 	>=mail-mta/postfix-2.4[mysql,ssl=]
 	virtual/cron
-	virtual/mysql
 	>=dev-lang/php-5.3:*[bcmath,cli,ctype,curl,filter,ftp,gd,mysql,nls,pcntl,pdo,posix,session,simplexml,ssl=,tokenizer,unicode,xml,xslt,zlib]
 	pureftpd? (
 		net-ftp/pure-ftpd[mysql,ssl=]
@@ -73,7 +71,10 @@ DEPEND="
 		)
 	)
 	fcgid? ( dev-lang/php:*[cgi]
-		 sys-auth/libnss-mysql
+		|| (
+			sys-auth/libnss-extrausers
+			sys-auth/libnss-mysql
+		)
 			( !lighttpd? (
 				!nginx? (
 					www-servers/apache[suexec]
@@ -83,7 +84,10 @@ DEPEND="
 			)
 	)
 	fpm? ( dev-lang/php:*[fpm]
-		sys-auth/libnss-mysql
+		|| (
+			sys-auth/libnss-extrausers
+			sys-auth/libnss-mysql
+		)
 	)
 	dovecot? ( >=net-mail/dovecot-2.2.0[mysql,ssl=]
 		   >=mail-mta/postfix-2.4[dovecot-sasl]
@@ -119,10 +123,6 @@ src_unpack() {
 	fi
 }
 
-src_prepare() {
-	epatch_user
-}
-
 src_install() {
 	# set default language
 	local MYLANG=""