diff --git a/srcpkgs/apache-directory-studio-bin/files/ApacheDirectoryStudio.desktop b/srcpkgs/apache-directory-studio-bin/files/ApacheDirectoryStudio.desktop
deleted file mode 100644
index 4f2488d8b8e..00000000000
--- a/srcpkgs/apache-directory-studio-bin/files/ApacheDirectoryStudio.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=2.0.0.v20130628
-Encoding=UTF-8
-Name=Apache Directory Studio
-Comment=${pkgdesc}
-Exec=/opt/ApacheDirectoryStudio/ApacheDirectoryStudio
-Icon=/opt/ApacheDirectoryStudio/ApacheDirectoryStudio.xpm
-Terminal=false
-Type=Application
-Categories=Java;Network;
diff --git a/srcpkgs/apache-directory-studio-bin/template b/srcpkgs/apache-directory-studio-bin/template
index e5ff27bf6f7..04e6a9f29d1 100644
--- a/srcpkgs/apache-directory-studio-bin/template
+++ b/srcpkgs/apache-directory-studio-bin/template
@@ -1,25 +1,38 @@
 # Template file for 'apache-directory-studio-bin'
 pkgname=apache-directory-studio-bin
 _pkgname=ApacheDirectoryStudio
-version=2.0.0.v20210717
-revision=2
-_versionprefix=M17
+version=2.0.0.v20210717+M17
+revision=1
+_version="${version/+/-}"
 archs="x86_64"
 depends="virtual?java-runtime gtk+3 desktop-file-utils"
 short_desc="LDAP browser and directory client"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="Apache-2.0"
 homepage="https://directory.apache.org/studio/"
-distfiles="https://www-eu.apache.org/dist/directory/studio/${version}-${_versionprefix}/${_pkgname}-${version}-${_versionprefix}-linux.gtk.x86_64.tar.gz"
-checksum=24764eff94ad3a257a899d34f9933276af0d201fba9017d6737558b2ffd5eda7
+distfiles="https://dlcdn.apache.org/directory/studio/${_version}/${_pkgname}-${_version}-linux.gtk.x86_64.tar.gz
+ https://dlcdn.apache.org/directory/studio/${_version}/${_pkgname}-${_version}-src.zip"
+checksum="24764eff94ad3a257a899d34f9933276af0d201fba9017d6737558b2ffd5eda7
+ 705d39148a0a3caf62c3f286726e2c289bdffc4b05671d7fe8a61ac41b5cc4f4"
 python_version=3
 nopie=yes
+skip_extraction="${_pkgname}-${_version}-src.zip"
+
+post_extract() {
+	bsdtar --strip-components 3 -xf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_pkgname}-${_version}-src.zip" \
+		"org.apache.directory.studio.parent-${_version}/tools/Debian Package/package"
+}
+
+post_patch() {
+	vsed -i -e "s/apachedirectorystudio/&bin/; /Exec/a Icon=${_pkgname,,}" \
+		package/usr/share/applications/${_pkgname,,}.desktop
+}
 
 do_install() {
 	vmkdir opt/${_pkgname}
 	vcopy * opt/${_pkgname}
-	vmkdir usr/share/applications
-	vinstall ${FILESDIR}/${_pkgname}.desktop 644 usr/share/applications
+	vinstall package/usr/share/applications/${_pkgname,,}.desktop 644 usr/share/applications
+	vinstall package/usr/share/pixmaps/${_pkgname,,}.xpm 644 usr/share/pixmaps
 	vmkdir usr/bin
 	ln -sf /opt/${_pkgname}/${_pkgname} ${DESTDIR}/usr/bin/${_pkgname}
 	ln -sf /opt/${_pkgname}/${_pkgname} ${DESTDIR}/usr/bin/${pkgname//-/}