diff --git a/metadata/md5-cache/net-nds/apachedirectorystudio-2.0.0.20200411 b/metadata/md5-cache/net-nds/apachedirectorystudio-2.0.0.20200411
new file mode 100644
index 0000000..de10724
--- /dev/null
+++ b/metadata/md5-cache/net-nds/apachedirectorystudio-2.0.0.20200411
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=Apache Directory Studio is an universal LDAP directory tool.
+EAPI=8
+HOMEPAGE=https://directory.apache.org/studio/
+INHERIT=desktop
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8.0 app-crypt/libsecret x11-libs/gtk+:3
+SLOT=2
+SRC_URI=https://downloads.apache.org/directory/studio/2.0.0.v20200411-M15/ApacheDirectoryStudio-2.0.0.v20200411-M15-linux.gtk.x86_64.tar.gz
+_eclasses_=desktop	3a72ffe0d8e1dd73af3a1c8c15a59fed
+_md5_=9867360bbef9783a7d1d4c76d4801d96
diff --git a/metadata/md5-cache/net-nds/apachedirectorystudio-2.0.0.20210717 b/metadata/md5-cache/net-nds/apachedirectorystudio-2.0.0.20210717
new file mode 100644
index 0000000..4837f4c
--- /dev/null
+++ b/metadata/md5-cache/net-nds/apachedirectorystudio-2.0.0.20210717
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=Apache Directory Studio is an universal LDAP directory tool.
+EAPI=8
+HOMEPAGE=https://directory.apache.org/studio/
+INHERIT=desktop
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8.0 app-crypt/libsecret x11-libs/gtk+:3
+SLOT=2
+SRC_URI=https://downloads.apache.org/directory/studio/2.0.0.v20210717-M17/ApacheDirectoryStudio-2.0.0.v20210717-M17-linux.gtk.x86_64.tar.gz
+_eclasses_=desktop	3a72ffe0d8e1dd73af3a1c8c15a59fed
+_md5_=cf76ca00142d595664788bb21bb42413
diff --git a/net-nds/apachedirectorystudio/Manifest b/net-nds/apachedirectorystudio/Manifest
index 8d92497..0e5214f 100644
--- a/net-nds/apachedirectorystudio/Manifest
+++ b/net-nds/apachedirectorystudio/Manifest
@@ -1 +1,2 @@
 DIST ApacheDirectoryStudio-2.0.0.v20200411-M15-linux.gtk.x86_64.tar.gz 138213439 BLAKE2B d3bd06af86f1605de8cf7cf2f8d1648709f9d1ceb97d0bffb4c14a800daeba65c0d1cefbfc4d2c0f123c1930b4fe0d658bee9c8dd162ec7ee7e3c7a815850487 SHA512 5fc6eee48ef63eef05f4c9a1859d4e60bbcdadc965cc34c0fb3be1e35c7a7ec69aeb07cc523a26eaf31b82289c848ce768c96928c4a4c6945aa3ddc36619d33a
+DIST ApacheDirectoryStudio-2.0.0.v20210717-M17-linux.gtk.x86_64.tar.gz 140122735 BLAKE2B d54f3dcb9fa7b1d54f88495415bd9e6f11e15f5c8ecb875a17a43eff417eb1f090df6dd4a9e71c22b55a265bf24ab94025b08b1bd2ff395b38bc0c5906a1e0ad SHA512 771a5c2d6b9f6f0487ceb435ee765863eb51a66f9ff4506fd5bba5745cff4c41b7557a7916dabe85bae8204e79746a1bb95d75c1aeacc474193cafc6401a8edb
diff --git a/net-nds/apachedirectorystudio/apachedirectorystudio-2.0.0.20200411.ebuild b/net-nds/apachedirectorystudio/apachedirectorystudio-2.0.0.20200411.ebuild
index 8a5adfd..4e9f37c 100644
--- a/net-nds/apachedirectorystudio/apachedirectorystudio-2.0.0.20200411.ebuild
+++ b/net-nds/apachedirectorystudio/apachedirectorystudio-2.0.0.20200411.ebuild
@@ -1,22 +1,21 @@
 # Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit desktop eutils
+inherit desktop
 
 MY_PV="${PV//.20/.v20}"
 MY_PN="ApacheDirectoryStudio"
 MY_PKGM=15
 
 DESCRIPTION="Apache Directory Studio is an universal LDAP directory tool."
-SRC_URI="https://downloads.apache.org/directory/studio/${MY_PV}-M${MY_PKGM}/${MY_PN}-${MY_PV}-M${MY_PKGM}-linux.gtk.x86_64.tar.gz"
 HOMEPAGE="https://directory.apache.org/studio/"
-
-KEYWORDS="~amd64"
-SLOT="2"
+SRC_URI="https://downloads.apache.org/directory/studio/${MY_PV}-M${MY_PKGM}/${MY_PN}-${MY_PV}-M${MY_PKGM}-linux.gtk.x86_64.tar.gz"
+S="${WORKDIR}/${MY_PN}"
 LICENSE="Apache-2.0"
-IUSE=""
+SLOT="2"
+KEYWORDS="~amd64"
 
 RDEPEND="
 	>=virtual/jre-1.8.0
@@ -26,7 +25,6 @@ RDEPEND="
 
 MY_ARCH="$ARCH"
 INSTALL_DIR="/opt/${MY_PN}"
-S="${WORKDIR}/${MY_PN}"
 
 src_install() {
 
diff --git a/net-nds/apachedirectorystudio/apachedirectorystudio-2.0.0.20210717.ebuild b/net-nds/apachedirectorystudio/apachedirectorystudio-2.0.0.20210717.ebuild
new file mode 100644
index 0000000..39ada3d
--- /dev/null
+++ b/net-nds/apachedirectorystudio/apachedirectorystudio-2.0.0.20210717.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+MY_PV="${PV//.20/.v20}"
+MY_PN="ApacheDirectoryStudio"
+MY_PKGM=17
+
+DESCRIPTION="Apache Directory Studio is an universal LDAP directory tool."
+HOMEPAGE="https://directory.apache.org/studio/"
+SRC_URI="https://downloads.apache.org/directory/studio/${MY_PV}-M${MY_PKGM}/${MY_PN}-${MY_PV}-M${MY_PKGM}-linux.gtk.x86_64.tar.gz"
+S="${WORKDIR}/${MY_PN}"
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=virtual/jre-1.8.0
+	app-crypt/libsecret
+	x11-libs/gtk+:3
+"
+
+MY_ARCH="$ARCH"
+INSTALL_DIR="/opt/${MY_PN}"
+
+src_install() {
+
+	insinto "${INSTALL_DIR}"
+	newicon "features/org.apache.directory.studio.schemaeditor.feature_${MY_PV}-M${MY_PKGM}/studio.png" "${MY_PN}.png"
+
+	make_desktop_entry "${MY_PN}" "Apache Directory Studio" "${MY_PN}" "System"
+
+	doins -r *
+
+	fperms +x "${INSTALL_DIR}/${MY_PN}"
+
+	dosym "${INSTALL_DIR}/${MY_PN}" "/usr/bin/${MY_PN}"
+}