diff --git a/recipes-bsp/trusted-firmware-a/tf-a-tools_2.6.bb b/recipes-bsp/trusted-firmware-a/tf-a-tools_2.6.bb
index 2526b3b..b1137f0 100644
--- a/recipes-bsp/trusted-firmware-a/tf-a-tools_2.6.bb
+++ b/recipes-bsp/trusted-firmware-a/tf-a-tools_2.6.bb
@@ -20,6 +20,14 @@ EXTRA_OEMAKE += "certtool fiptool"
 
 do_configure[noexec] = "1"
 
+do_compile:prepend () {
+    # This is still needed to have the native fiptool executing properly by
+    # setting the RPATH
+    sed -e '/^LDLIBS/ s,$, \$\{BUILD_LDFLAGS},' \
+        -e '/^INCLUDE_PATHS/ s,$, \$\{BUILD_CFLAGS},' \
+        -i ${S}/tools/fiptool/Makefile
+}
+
 do_install() {
     install -d ${D}${bindir}
     install -m 0755 \