diff --git a/extras/tools/SHA512SUMS b/extras/tools/SHA512SUMS
index 9abcd4b0184f..b5abcdf3bd41 100644
--- a/extras/tools/SHA512SUMS
+++ b/extras/tools/SHA512SUMS
@@ -17,5 +17,5 @@ d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b
 8b5768cf0dab5f88d2f3e3962305910e707ff810cbd21b5997aab0bb6abe1c4d5dbd24ec59ab4072f1faa9b81daa8be993d56679445afa93700676f52e314d23  meson-1.2.0.tar.gz
 27acef46d9eb67203d708b57d80b853f76fa4b9c2720ff36ec161e6cdf702249e7982214ddf60bae75511aa79bc7d92aa27e3eab7ef9c0f5c040e8e42e76a385  libtool-2.4.7.tar.gz
 855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4  gperf-3.1.tar.gz
-1bf28876ee38557042bf790af3d06ae0dcddc2d310480a821fbae1f269d433259b1ef0243fa6eff829ce67a22e8461655d41bbb7382355b7530d5648e296c9d6  config.guess
-14e316b18542d0a971d925a0dfca38f67680f1e2933d170767b59137d527a15d2b785910c9ba0845ebba7e089e3a05fe60aabd6a7c06a7481822942a698f8a6a  config.sub
+1bf28876ee38557042bf790af3d06ae0dcddc2d310480a821fbae1f269d433259b1ef0243fa6eff829ce67a22e8461655d41bbb7382355b7530d5648e296c9d6  config.guess-948ae97ca5703224bd3eada06b7a69f40dd15a02
+14e316b18542d0a971d925a0dfca38f67680f1e2933d170767b59137d527a15d2b785910c9ba0845ebba7e089e3a05fe60aabd6a7c06a7481822942a698f8a6a  config.sub-948ae97ca5703224bd3eada06b7a69f40dd15a02
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index ad3cdba9d40d..18f66857ef36 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -167,14 +167,20 @@ CLEAN_FILE += .buildxz
 
 # config.guess
 
-config.guess:UNPACK_DIR=.
-config.guess:
+config.guess-$(CONFIGGUESS_VERSION):
 	$(call download_pkg,$(CONFIGGUESS_URL),config.guess)
+
+config.sub-$(CONFIGSUB_VERSION):
+	$(call download_pkg,$(CONFIGSUB_URL),config.sub)
+
+config.guess: UNPACK_DIR=.
+config.guess: config.guess-$(CONFIGGUESS_VERSION)
+	cp -f $< $@
 	$(APPLY) $(TOOLS)/config.guess-config-add-support-for-arm64_32.patch
 
 config.sub:UNPACK_DIR=.
-config.sub:
-	$(call download_pkg,$(CONFIGSUB_URL),config.sub)
+config.sub: config.sub-$(CONFIGSUB_VERSION)
+	cp -f $< $@
 	$(APPLY) $(TOOLS)/config.sub-config-add-support-for-arm64_32.patch
 
 .buildconfigguess: config.guess config.sub