diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index a517505c998..a2ab3a93a83 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,7 +1,8 @@
 # Template file for 's-nail'
 pkgname=s-nail
 version=14.8.5
-revision=1
+revision=2
+build_pie=yes
 makedepends="libressl-devel libidn-devel"
 conf_files="/etc/mail.rc"
 short_desc="Mail processing system with a command syntax reminiscent of ed"
@@ -12,7 +13,11 @@ distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version//./_}.tar.gz"
 checksum="0f4f157c9517ba1990dd68ccf1b48d3d167fe867399385d7a4e4d0492e981908"
 
 provides="mail-${version}_${revision}"
-replaces="mail>=0"
+
+alternatives="
+ mail:mail:/usr/bin/s-nail
+ mail:mail.1:/usr/share/man/man1/s-nail.1
+"
 
 do_build() {
 	make CC=$CC PREFIX=/usr SYSCONFDIR=/etc SID= NAIL=mail BINDIR=/usr/bin MANDIR=/usr/share/man \
@@ -23,5 +28,7 @@ do_build() {
 
 do_install() {
 	make DESTDIR=$DESTDIR packager-install
+	mv ${DESTDIR}/usr/bin/{mail,$pkgname}
+	mv ${DESTDIR}/usr/share/man/man1/{mail,$pkgname}.1
 	vlicense COPYING
 }