diff --git a/common/environment/configure/bootstrap.sh b/common/environment/configure/bootstrap.sh
index ba81f64c150..f5ba5f442c7 100644
--- a/common/environment/configure/bootstrap.sh
+++ b/common/environment/configure/bootstrap.sh
@@ -1,4 +1,4 @@
 if [ -z "$CHROOT_READY" ]; then
-	CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"
-	LDFLAGS+=" -L${XBPS_MASTERDIR}/usr/lib"
+	CFLAGS+=" -isystem ${XBPS_MASTERDIR}/usr/include"
+	LDFLAGS+=" -L${XBPS_MASTERDIR}/usr/lib -Wl,-rpath-link=${XBPS_MASTERDIR}/usr/lib"
 fi