diff --git a/www-apps/froxlor/froxlor-0.9.40.1.ebuild b/www-apps/froxlor/froxlor-0.9.40.1.ebuild
index 54f1f52..23e7991 100644
--- a/www-apps/froxlor/froxlor-0.9.40.1.ebuild
+++ b/www-apps/froxlor/froxlor-0.9.40.1.ebuild
@@ -47,7 +47,7 @@ DEPEND="
 	!awstats? (
 		app-admin/webalizer
 	)
-	bind? ( net-dns/bind[ssl=]
+	bind? ( net-dns/bind
 		domainkey? ( mail-filter/opendkim[ssl=,libressl=] )
 	)
 	pdns? ( net-dns/pdns[mysql]
diff --git a/www-apps/froxlor/froxlor-0.9.9999.ebuild b/www-apps/froxlor/froxlor-0.9.9999.ebuild
index 84282d3..76d60da 100644
--- a/www-apps/froxlor/froxlor-0.9.9999.ebuild
+++ b/www-apps/froxlor/froxlor-0.9.9999.ebuild
@@ -47,7 +47,7 @@ DEPEND="
 	!awstats? (
 		app-admin/webalizer
 	)
-	bind? ( net-dns/bind[ssl=]
+	bind? ( net-dns/bind
 		domainkey? ( mail-filter/opendkim[ssl=,libressl=] )
 	)
 	pdns? ( net-dns/pdns[mysql]
diff --git a/www-apps/froxlor/froxlor-9999.ebuild b/www-apps/froxlor/froxlor-9999.ebuild
index c59049a..2e992e4 100644
--- a/www-apps/froxlor/froxlor-9999.ebuild
+++ b/www-apps/froxlor/froxlor-9999.ebuild
@@ -45,7 +45,7 @@ DEPEND="
 	!awstats? (
 		app-admin/webalizer
 	)
-	bind? ( net-dns/bind[ssl=]
+	bind? ( net-dns/bind
 		domainkey? ( mail-filter/opendkim[ssl=,libressl=] )
 	)
 	pdns? ( net-dns/pdns[mysql]
@@ -270,6 +270,7 @@ src_install() {
 	# Install the Froxlor files
 	einfo "Installing Froxlor files"
 	dodir ${FROXLOR_DOCROOT}
+	egit_clean
 	cp -R "${S}/" "${D}${FROXLOR_DOCROOT}/" || die "Installation of the Froxlor files failed"
 }
 
diff --git a/www-apps/froxlor/metadata.xml b/www-apps/froxlor/metadata.xml
index 2351fda..5d4cfc5 100644
--- a/www-apps/froxlor/metadata.xml
+++ b/www-apps/froxlor/metadata.xml
@@ -27,6 +27,7 @@
     <flag name='vsftpd'>use vsFTPd instead of ProFTPd</flag>
   </use>
   <upstream>
+    <remote-id type="cpe">cpe:/a:froxlor:froxlor</remote-id>
     <remote-id type="github">Froxlor/Froxlor</remote-id>
   </upstream>
 </pkgmetadata>