diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index c9a1b0e8cd2..0fb6d15ab10 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -1,7 +1,7 @@
 # Template build file for 'thunderbird'.
 pkgname=thunderbird
 version=38.3.0
-revision=4
+revision=5
 wrksrc="comm-esr${version/.*/}"
 short_desc="Standalone Mail/News reader"
 maintainer="Enno Boland <gottox@voidlinux.eu>"
@@ -60,7 +60,6 @@ do_configure() {
 			-I${XBPS_CROSS_BASE}/usr/include/nspr \
 			-I${XBPS_CROSS_BASE}/usr/include/nss"
 		export CXXFLAGS+=" ${CFLAGS}"
-		export LDFLAGS+=" -L${XBPS_CROSS_BASE}/usr/lib"
 
 		export ac_cv_sqlite_secure_delete=yes \
 			ac_cv_sqlite_threadsafe=yes \
@@ -94,9 +93,6 @@ do_configure() {
 		--enable-optimize="$CFLAGS" --disable-strip --disable-install-strip \
 		--disable-static --enable-pie \
 		--disable-profiling --disable-profilelocking
-	if [ "$CROSS_BUILD" ]; then
-		sed -i "s#-L/usr/lib ##" `find . -name '*.mk' -or -name Makefile`
-	fi
 }
 do_build() {
 	cd xbps-build
@@ -121,6 +117,7 @@ do_install() {
 
 	# We don't want the development stuff
 	rm -r ${DESTDIR}/usr/{include,share/idl}
+	rm -r ${DESTDIR}/usr/lib/thunderbird-devel
 
 	# same binaries : usr/lib/thunderbird/{thunderbird-bin,thunderbird}
 	rm -f ${DESTDIR}/usr/lib/thunderbird/thunderbird-bin