diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
index a7d2a09f8..9c79ef2db 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -94,7 +94,7 @@ jobs:
         config: [debug, release]
         msystem: [mingw32, mingw64]
         depsrc: [none, contrib, system]
-        cc: [mingw]
+        cc: [gcc]
         include:
           - platform: x86
             msystem: mingw32
@@ -132,7 +132,7 @@ jobs:
     - name: Docs check
       run: bin/${{ matrix.config }}/premake5.exe docs-check
     - name: Upload Artifacts
-      if: matrix.config == 'release' && matrix.depsrc == 'contrib' && matrix.cc == 'mingw'
+      if: matrix.config == 'release' && matrix.depsrc == 'contrib' && matrix.cc == 'gcc'
       uses: actions/upload-artifact@v4
       with:
         name: premake-${{ matrix.msystem }}-${{ matrix.platform }}
diff --git a/Bootstrap.mak b/Bootstrap.mak
index 4d45ea98a..46ddce7b8 100644
--- a/Bootstrap.mak
+++ b/Bootstrap.mak
@@ -89,7 +89,7 @@ mingw: mingw-clean
 	mkdir -p build/bootstrap
 	$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_STATICLIB -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $(SRC) -lole32 -lversion
 	./build/bootstrap/premake_bootstrap embed
-	./build/bootstrap/premake_bootstrap --arch=$(PLATFORM) --os=windows --to=build/bootstrap --cc=mingw $(PREMAKE_OPTS) gmake
+	./build/bootstrap/premake_bootstrap --arch=$(PLATFORM) --os=windows --to=build/bootstrap --cc=gcc $(PREMAKE_OPTS) gmake
 	$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG)_$(PLATFORM:x86=win32)
 
 macosx: osx
diff --git a/premake5.lua b/premake5.lua
index 2653349db..35a8f771b 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -253,8 +253,8 @@
 			flags       { "NoIncrementalLink" }
 
 		-- MinGW AR does not handle LTO out of the box and need a plugin to be setup
-		filter { "system:windows", "configurations:Release", "toolset:not mingw" }
-			flags		{ "LinkTimeOptimization" }
+		filter { "system:windows", "configurations:Release", "toolset:msc" }
+			flags { "LinkTimeOptimization" }
 
 		filter { "system:uwp" }
 			systemversion "latest:latest"
@@ -312,8 +312,8 @@
 			links       { "ole32", "ws2_32", "advapi32", "version" }
 			files { "src/**.rc" }
 
-		filter "toolset:mingw"
-			links		{ "crypt32", "bcrypt" }
+		filter { "system:windows", "toolset:not msc" }
+			links { "crypt32", "bcrypt" }
 
 		filter "system:linux or bsd or hurd"
 			defines     { "LUA_USE_POSIX", "LUA_USE_DLOPEN" }
diff --git a/src/_manifest.lua b/src/_manifest.lua
index 79396b1ed..c5481f912 100644
--- a/src/_manifest.lua
+++ b/src/_manifest.lua
@@ -64,7 +64,6 @@
 		"tools/msc.lua",
 		"tools/snc.lua",
 		"tools/clang.lua",
-		"tools/mingw.lua",
 		"tools/cosmocc.lua",
 		"tools/emcc.lua",
 
diff --git a/src/_premake_init.lua b/src/_premake_init.lua
index bfa4d2939..5b8ed4a11 100644
--- a/src/_premake_init.lua
+++ b/src/_premake_init.lua
@@ -1218,7 +1218,7 @@
 		allowed = {
 			{ "clang", "Clang (clang)" },
 			{ "gcc", "GNU GCC (gcc/g++)" },
-			{ "mingw", "MinGW GCC (gcc/g++)" },
+			{ "mingw", "MinGW GCC (gcc/g++)" }, -- deprecated
 			{ "msc-v80", "Microsoft compiler (Visual Studio 2005)" },
 			{ "msc-v90", "Microsoft compiler (Visual Studio 2008)" },
 			{ "msc-v100", "Microsoft compiler (Visual Studio 2010)" },
@@ -1235,6 +1235,11 @@
 		}
 	}
 
+	if _OPTIONS[cc] == "mingw" then
+		p.warn("--cc=mingw is deprecated, use --cc=gcc instead")
+		_OPTIONS[cc] = "gcc"
+	end
+
 	newoption
 	{
 		category	= "compilers",
diff --git a/src/tools/mingw.lua b/src/tools/mingw.lua
deleted file mode 100644
index cb8ee9afb..000000000
--- a/src/tools/mingw.lua
+++ /dev/null
@@ -1,8 +0,0 @@
---
--- mingw.lua
--- MinGW toolset adapter for Premake
--- Copyright (c) 2018 Jess Perkins and the Premake project
---
-
-	local p = premake
-	p.tools.mingw = p.tools.gcc