diff --git a/meta-arm/recipes-bsp/hafnium/hafnium/hashbang.patch b/meta-arm/recipes-bsp/hafnium/hafnium/hashbang.patch
new file mode 100644
index 00000000..af77e7c7
--- /dev/null
+++ b/meta-arm/recipes-bsp/hafnium/hafnium/hashbang.patch
@@ -0,0 +1,34 @@
+Update Clang hashbangs to call python3 instead of python, as that doesn't exist
+in our hosttools.
+
+Upstream-Status: Backport [partial, fixed upstream]
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+diff --git a/linux-x64/clang/bin/clang b/prebuilts/linux-x64/clang/bin/clang
+index 081cb20a..ce9cc267 100755
+--- a/prebuilts/linux-x64/clang/bin/clang
++++ b/prebuilts/linux-x64/clang/bin/clang
+@@ -1 +1 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+diff --git a/prebuilts/linux-x64/clang/bin/clang++ b/prebuilts/linux-x64/clang/bin/clang++
+index 081cb20a..ce9cc267 100755
+--- a/prebuilts/linux-x64/clang/bin/clang++
++++ b/prebuilts/linux-x64/clang/bin/clang++
+@@ -1 +1 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+diff --git a/prebuilts/linux-x64/clang/bin/clang-tidy b/prebuilts/linux-x64/clang/bin/clang-tidy
+index 081cb20a..ce9cc267 100755
+--- a/prebuilts/linux-x64/clang/bin/clang-tidy
++++ b/prebuilts/linux-x64/clang/bin/clang-tidy
+@@ -1 +1 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+diff --git a/prebuilts/linux-x64/clang/bin/scan-view b/prebuilts/linux-x64/clang/bin/scan-view
+index 6165432e..07effbca 100755
+--- a/prebuilts/linux-x64/clang/bin/scan-view
++++ b/prebuilts/linux-x64/clang/bin/scan-view
+@@ -1 +1 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
diff --git a/meta-arm/recipes-bsp/hafnium/hafnium_2.5.bb b/meta-arm/recipes-bsp/hafnium/hafnium_2.5.bb
index 9f05b725..595f53c9 100644
--- a/meta-arm/recipes-bsp/hafnium/hafnium_2.5.bb
+++ b/meta-arm/recipes-bsp/hafnium/hafnium_2.5.bb
@@ -8,6 +8,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit deploy python3native pkgconfig
 
 SRC_URI = "gitsm://git.trustedfirmware.org/hafnium/hafnium.git;protocol=https \
+           file://hashbang.patch \
            file://pkg-config-native.patch"
 SRCREV = "3a149eb219467c0d9336467ea1fb9d3fb65da94b"
 S = "${WORKDIR}/git"
@@ -33,12 +34,6 @@ DEPENDS = "bison-native bc-native openssl-native"
 # set project to build
 EXTRA_OEMAKE += "PROJECT=${HAFNIUM_PROJECT}"
 
-do_compile:prepend() {
-    # Hafnium expects 'python'. Create symlink python to python3
-    real=$(which ${PYTHON})
-    ln -snf $real $(dirname $real)/python
-}
-
 do_install() {
     install -d -m 755 ${D}/firmware
     for bldfile in ${HAFNIUM_INSTALL_TARGET}; do