diff --git a/config/multithread b/config/multithread
index 34ccc0b1f7..ca30caf7a6 100644
--- a/config/multithread
+++ b/config/multithread
@@ -175,6 +175,8 @@ start_multithread_build() {
     ${SCRIPTS}/genbuildplan.py --no-reorder --show-wants --build ${@} > "${THREAD_CONTROL}"/plan || result=1
 
   if [ ${result} -eq 0 ]; then
+    save_build_config
+
     cat "${THREAD_CONTROL}"/plan | awk '{print $1 " " $2}' | \
       MTBUILDSTART=$(date +%s) MTWITHLOCKS=yes ${TOOLCHAIN}/bin/parallel \
         --plain --no-notice --max-procs ${THREADCOUNT} --joblog="${THREAD_CONTROL}/joblog" --plus ${buildopts} \
diff --git a/scripts/image b/scripts/image
index 5c91ee1d08..3663761d36 100755
--- a/scripts/image
+++ b/scripts/image
@@ -11,7 +11,6 @@ unset _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL _DEBUG_DEPENDS_LIST _DEBUG_PACK
 . config/show_config
 
 show_config
-save_build_config
 
 ${SCRIPTS}/checkdeps