diff --git a/srcpkgs/firebird3/template b/srcpkgs/firebird3/template
index 8f2285dc772..575415d2128 100644
--- a/srcpkgs/firebird3/template
+++ b/srcpkgs/firebird3/template
@@ -1,7 +1,7 @@
 # Template file for 'firebird3'
 pkgname=firebird3
 version=3.0.6.33328
-revision=1
+revision=2
 _build=0
 _uver=${version//./_}
 build_style=gnu-configure
@@ -30,7 +30,7 @@ makedepends="boost-devel libedit-devel icu-devel ncurses-devel libatomic_ops-dev
  libtommath-devel zlib-devel"
 short_desc="Relational database offering many ANSI SQL standard features (V3)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="custom"
+license="custom:IDPL-1.0, Interbase-1.0"
 homepage="https://www.firebirdsql.org/en/start/"
 distfiles="https://github.com/FirebirdSQL/firebird/releases/download/R${_uver%_*}/Firebird-${version}-${_build}.tar.bz2"
 checksum=34c1d2a29bbaf288e682cd1b5f8083f2baf73f351062245ace0bee35a3f7d35f
@@ -87,7 +87,7 @@ pre_configure() {
 	# do not change ownership to root:root and
 	# do not change permissions to read-only
 	find -iname "*.sh.in" -exec sed -i "{}" \
-		-e 's;"`whoami`";"root";' \
+		-e 's;"\x60whoami\x60";"root";' \
 		-e 's;chown root:root;#&;' \
 		-e 's;chown -R;#&;' \
 		-e 's;chmod 0444;chmod 0644;' \
@@ -113,6 +113,9 @@ do_install() {
 
 	cp -pR gen/buildroot/* ${DESTDIR}/
 
+	# Conflicts with isql from unixodbc.
+	mv ${DESTDIR}/usr/bin/isql{,-fb}
+
 	# TODO: create superserver?
 	# system account?
 	# runit service?