diff --git a/bin/bitbake-setup b/bin/bitbake-setup
index 9d08f3a1b..edb8c4d1f 100755
--- a/bin/bitbake-setup
+++ b/bin/bitbake-setup
@@ -310,6 +310,15 @@ def setup_bitbake_build(bitbake_config, layerdir, setupdir, thisdir, update_bb_c
 # layer fragments from changes made here.
 #
 """
+
+        local_conf_extra = bitbake_config.get("bb-local-conf-header")
+        if local_conf_extra:
+            local_conf += "\n# Added by bitbake-setup from bb-local-conf-header\n"
+            if isinstance(local_conf_extra, list):
+                local_conf += "\n".join(local_conf_extra) + "\n"
+            else:
+                local_conf += str(local_conf_extra) + "\n"
+
         with open(os.path.join(build_conf_dir, "local.conf"), 'w') as f:
             f.write(local_conf)