diff --git a/srcpkgs/cdb/template b/srcpkgs/cdb/template
index 70f352b1134..82060f21fc4 100644
--- a/srcpkgs/cdb/template
+++ b/srcpkgs/cdb/template
@@ -9,15 +9,20 @@ license="Public domain"
 homepage="http://cr.yp.to/cdb.html"
 distfiles="http://cr.yp.to/cdb/cdb-${version}.tar.gz"
 checksum="1919577799a50c080a8a05a1cbfa5fa7e7abc823d8d7df2eeb181e624b7952c5"
-conflicts="freecdb>=0"
+
+alternatives="
+ cdb:cdbdump:/usr/bin/cdb-dump
+ cdb:cdbdump:/usr/share/man/man1/cdb-dump.1
+ cdb:cdbget:/usr/bin/cdb-get
+ cdb:cdbget:/usr/share/man/man1/cdb-get.1
+ cdb:cdbmake:/usr/bin/cdb-make
+ cdb:cdbmake:/usr/share/man/man1/cdb-make.1
+ cdb:cdbstats:/usr/bin/cdb-stats
+ cdb:cdbstats:/usr/share/man/man1/cdb-stats.1
+"
 
 do_install() {
-	vbin cdbget
-	vbin cdbmake
-	vbin cdbdump
-	vbin cdbstats
-	vbin cdbtest
-	vbin cdbmake-12
-	vbin cdbmake-sv
+	for f in dump get make stats test make-12 make-sv; do
+		vbin cdb${f} cdb-${f}
+	done
 }
-
diff --git a/srcpkgs/freecdb/template b/srcpkgs/freecdb/template
index 7b9e178e79b..de0621dc858 100644
--- a/srcpkgs/freecdb/template
+++ b/srcpkgs/freecdb/template
@@ -1,23 +1,29 @@
 # Template file for 'freecdb'
 pkgname=freecdb
 version=0.75
-revision=1
+revision=2
 build_style=gnu-makefile
 short_desc="Creating and reading constant databases"
 maintainer="Toyam Cox <Vaelatern@gmail.com>"
 license="Public Domain"
-conflicts="cdb"
 homepage="https://packages.debian.org/source/sid/freecdb"
 distfiles="http://http.debian.net/debian/pool/main/f/${pkgname}/${pkgname}_${version}.tar.gz"
 checksum=95214e485bd3ece2dc2a035e7bd25f080603f8f3b7a1ff329c1c67303700a0e3
 
+alternatives="
+ cdb:cdbdump:/usr/bin/${pkgname}dump
+ cdb:cdbdump:/usr/share/man/man1/${pkgname}dump.1
+ cdb:cdbget:/usr/bin/${pkgname}get
+ cdb:cdbget:/usr/share/man/man1/${pkgname}get.1
+ cdb:cdbmake:/usr/bin/${pkgname}make
+ cdb:cdbmake:/usr/share/man/man1/${pkgname}make.1
+ cdb:cdbstats:/usr/bin/${pkgname}stats
+ cdb:cdbstats:/usr/share/man/man1/${pkgname}stats.1
+"
+
 do_install() {
-	vman cdbdump.1
-	vman cdbget.1
-	vman cdbmake.1
-	vman cdbstats.1
-	vbin cdbdump
-	vbin cdbget
-	vbin cdbmake
-	vbin cdbstats
+	for f in dump get make stats; do
+		vman cdb${f}.1 ${pkgname}${f}.1
+		vbin cdb${f} ${pkgname}${f}
+	done
 }