diff --git a/srcpkgs/firebird/template b/srcpkgs/firebird/template
index be8d03069e..adc9ccbee4 100644
--- a/srcpkgs/firebird/template
+++ b/srcpkgs/firebird/template
@@ -1,16 +1,14 @@
 # Template file for 'firebird'
 pkgname=firebird
 version=2.5.5.26952
-revision=1
+revision=2
 _build=0
 wrksrc="${pkgname^}-${version}-${_build}"
 build_style=gnu-configure
 configure_args="--prefix=/opt/firebird --with-system-icu --with-system-editline"
-nopie=yes
 nocross=yes
 hostmakedepends="automake libtool pkg-config icu"
 makedepends="boost-devel libedit-devel icu-devel ncurses-devel libatomic_ops-devel"
-depends="libfbclient>=${version}_${revision}"
 short_desc="Relational database offering many ANSI SQL standard features"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="custom"
@@ -20,20 +18,22 @@ checksum=b33e63ede88184d9ef2ae6760537ab75bfe641513821410b83e837946162b7d1
 disable_parallel_build=yes
 
 pre_configure() {
-	mv configure.{in,ac}
-	mkdir -p m4
-	echo "ACLOCAL_AMFLAGS = -I m4" > Makefile.am
-
 	# Avoid errors telling we are not 'root' and
-	# do not cange ownership to root:root or
-	# permissions to read-only
+	# 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;chown root:root;#&;' \
 		-e 's;chown -R;#&;' \
 		-e 's;chmod 0444;chmod 0644;' \
 		-e 's;chmod 0555;chmod 0755;' \;
+	mv configure.{in,ac}
+	mkdir -p m4
+	echo "ACLOCAL_AMFLAGS = -I m4" > Makefile.am
 	autoreconf -if
+
+	# Set -fPIC for btyacc tool to support PIE linker flags
+	sed -i extern/btyacc/Makefile -e 's;CFLAGS=;CFLAGS=-fPIC;'
 }
 
 do_install() {
@@ -87,6 +87,7 @@ libfbclient_package() {
 	short_desc+=" - client libraries"
 	pkg_install() {
 		local _v _v0=${version%.*} _v1=${version%.*.*} _v2=${version%.*.*.*}
+		vmove usr/bin/fb_config
 		for _v in ${_v0} ${_v1} ${_v2}; do
 			vmove usr/lib/libfbclient.so.${_v}
 			vmove usr/lib/libfbembed.so.${_v}
@@ -94,7 +95,6 @@ libfbclient_package() {
 		vmove usr/lib/libgds.so.0
 		vmove usr/lib/libib_util.so
 		vmove opt/firebird/*.msg
-		vmove usr/bin/fb_config
 		vlicense doc/license/IDPL.txt IDPL
 		vlicense doc/license/README.license.usage.txt LICENSE
 	}