diff --git a/common.mk b/common.mk
index 0c24c7e8d06de0585fa94d2f7e2506a3e5e2614d..48c31d4fc22c148405957f3e40dc72a7bf99f204 100644
--- a/common.mk
+++ b/common.mk
@@ -206,6 +206,10 @@ buildroot: optee-os
 		../out-br/extra.conf
 ifneq (,$(BR2_ROOTFS_OVERLAY))
 	@echo "BR2_ROOTFS_OVERLAY=\"$(BR2_ROOTFS_OVERLAY)\"" >> ../out-br/extra.conf
+endif
+ifneq (,$(BR2_ROOTFS_POST_BUILD_SCRIPT))
+	@echo "BR2_ROOTFS_POST_BUILD_SCRIPT=\"$(BR2_ROOTFS_POST_BUILD_SCRIPT)\"" >> \
+		../out-br/extra.conf
 endif
 	@echo "BR2_PACKAGE_OPTEE_TEST_CROSS_COMPILE=\"$(CROSS_COMPILE_S_USER)\"" >> \
 		../out-br/extra.conf
diff --git a/rpi3.mk b/rpi3.mk
index a5768617714a5de56041733c97af424e1cc9211d..cf89462bac2ef9b952a3798395499d3d3aeafe06 100644
--- a/rpi3.mk
+++ b/rpi3.mk
@@ -10,6 +10,7 @@ override COMPILE_S_KERNEL  := 64
 
 # Need to set this before including common.mk
 BUILDROOT_GETTY_PORT ?= ttyS0
+BR2_ROOTFS_POST_BUILD_SCRIPT ?= "board/raspberrypi3-64/post-build.sh"
 
 include common.mk