diff --git a/srcpkgs/man-db/template b/srcpkgs/man-db/template
index 56a59140ddc..6c4bfadc6b6 100644
--- a/srcpkgs/man-db/template
+++ b/srcpkgs/man-db/template
@@ -1,7 +1,7 @@
 # Template file for 'man-db'
 pkgname=man-db
 version=2.7.4
-revision=1
+revision=2
 lib32disabled=yes
 build_style=gnu-configure
 configure_args="--with-db=db --with-pager=less --with-gzip=/usr/bin/gzip
@@ -11,8 +11,8 @@ configure_args="--with-db=db --with-pager=less --with-gzip=/usr/bin/gzip
 hostmakedepends="pkg-config groff"
 makedepends="gettext-devel db-devel zlib-devel libpipeline-devel groff"
 depends="bzip2 gzip less groff grep coreutils"
-conflicts="mdocml>=0"
 conf_files="/etc/man_db.conf"
+provides="man-0_1"
 short_desc="The on-line manual database"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2, LGPL-2.1"
@@ -20,6 +20,14 @@ homepage="http://www.nongnu.org/man-db/"
 distfiles="${NONGNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
 checksum=153f4d3c33f5f9b0c8484bb39d9d271f6ae4aa1b3f5d6d515879692dba944f0b
 
+alternatives="
+ man:man:/usr/bin/mandb-man
+ man:whatis:/usr/bin/mandb-whatis
+ man:apropos:/usr/bin/mandb-whatis
+ man:man.1:/usr/share/man/man1/mandb-man.1
+ man:whatis.1:/usr/share/man/man1/mandb-whatis.1
+ man:apropos.1:/usr/share/man/man1/mandb-apropos.1"
+
 pre_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl) CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/gettext"
@@ -27,6 +35,12 @@ pre_configure() {
 	esac
 }
 post_install() {
+	rm -r ${DESTDIR}/usr/lib/tmpfiles.d
+	# Rename files for alternatives
+	for f in apropos man whatis; do
+		mv ${DESTDIR}/usr/bin/{$f,mandb-$f}
+		mv ${DESTDIR}/usr/share/man/man1/{$f,mandb-$f}.1
+	done
 	# Install the cron daily job.
 	vinstall ${FILESDIR}/man-db.cron-daily 744 etc/cron.daily man-db
 }