diff --git a/Makefile b/Makefile
index 0c79f5a2892..922e0c58490 100644
--- a/Makefile
+++ b/Makefile
@@ -267,11 +267,9 @@ release-%:
 
 ifeq ($(OCAML_PORT),)
 ifneq ($(COMSPEC),)
-ifeq ($(shell which gcc 2>/dev/null),)
 OCAML_PORT=auto
 endif
 endif
-endif
 
 .PHONY: compiler cold
 compiler:
diff --git a/master_changes.md b/master_changes.md
index ee72f3f45d1..5b8e0f6462b 100644
--- a/master_changes.md
+++ b/master_changes.md
@@ -66,6 +66,7 @@ users)
 ## Build
   * Remove `bigarray` dependency [#5612 @kit-ty-kate]
   * Remove use of deprecated `Printf.kprintf" [#5612 @kit-ty-kate]
+  * Fix "make cold" on Windows when gcc is available [#5635 @kit-ty-kate - fixes #5600]
 
 ## Infrastructure