diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index a09763f08b..e6e512a114 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,12 +1,11 @@
 # Template file for 'opensmtpd'
 pkgname=opensmtpd
 version=5.9.2p1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
- --with-maildir=/var/spool/mail --with-privsep-path=/var/empty
- --with-sock-dir=/run --with-mantype=doc --with-pie --enable-table-db
- --with-ca-file=/etc/ssl/certs/ca-certificates.crt"
+ --with-path-socket=/run --with-mantype=doc --with-pie --enable-table-db
+ --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt"
 hostmakedepends="automake libtool pkg-config bison"
 makedepends="zlib-devel libressl-devel libevent-devel db-devel libasr-devel"
 depends="ca-certificates"
@@ -23,8 +22,8 @@ checksum=3522f273c1630c781facdb2b921228e338ed4e651909316735df775d6a70a71d
 system_accounts="_smtpd _smtpq"
 
 case "$XBPS_TARGET_MACHINE" in
-	*-musl) makedepends+=" musl-fts-devel"
-		LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib -lfts"
+	*-musl) configure_args+=" --with-libfts=${XBPS_CROSS_BASE}/usr"
+		makedepends+=" musl-fts-devel"
 		;;
 esac
 
@@ -38,6 +37,9 @@ pre_configure() {
 	sed -ri 's,/etc/mail,/etc/smtpd,g' smtpd/smtpd.conf
 }
 post_install() {
+	for f in newaliases makemap sendmail; do
+		ln -s smtpctl ${DESTDIR}/usr/bin/$f
+	done
 	vsv opensmtpd
 	vlicense LICENSE
 	vinstall /dev/null 644 etc/smtpd aliases