diff --git a/Quake/Makefile.darwin b/Quake/Makefile.darwin
index 7e4b39c1..d0f14535 100644
--- a/Quake/Makefile.darwin
+++ b/Quake/Makefile.darwin
@@ -1,8 +1,9 @@
-# GNU Makefile for QuakeSpasm for Mac OS X, Sep. 10, 2014.
+# GNU Makefile for compiling Mac OS X version of QuakeSpasm.
 # Usage: "make -f Makefile.darwin"
-# You need the SDL library fully installed.
+# To cross-compile on Linux hosts, see the "build_cross_osx*.sh" scripts.
 # "make DEBUG=1" to build a debug client.
-# "make SDL_FRAMEWORK_PATH=/path/to/Frameworks" to specify the directory containing SDL.framework
+# "make SDL_FRAMEWORK_PATH=/path/to/Frameworks" to specify the directory
+#    containing SDL.framework and override the locally included versions.
 # "make DO_USERDIRS=1" to enable user directories support
 
 # Enable/Disable user directories support
diff --git a/Quake/Makefile.w32 b/Quake/Makefile.w32
index 9d2c124f..19589f0c 100644
--- a/Quake/Makefile.w32
+++ b/Quake/Makefile.w32
@@ -1,9 +1,9 @@
-# GNU Makefile for cross-compiling quakespasm.exe (Win32: MinGW)
-# using cross-toolchains on a linux host, Sep. 10, 2014
+# GNU Makefile for compiling Win32 quakespasm.exe using MinGW or MinGW-w64.
+# Usage: "make -f Makefile.w32"
+# To cross-compile on Linux hosts, see the "build_cross_win32*.sh" scripts.
 # "make DEBUG=1" to build a debug client.
-# "make SDL_CONFIG=/path/to/sdl-config" for unusual SDL installations.
+# "make SDL_CONFIG=/path/to/sdl-config" to override the locally included SDL versions.
 # "make WINSOCK2=1" to use WinSock2 api instead of old WinSock 1.1.
-# "make CROSS_COMPILE=0" to build natively on windows with mingw and msys
 
 ### Enable/disable SDL2
 USE_SDL2=0
@@ -39,21 +39,11 @@ WINSOCK2?= 0
 # build variables
 # ---------------------------
 
-TARGET=i686-pc-mingw32
-
-CROSS_COMPILE=1
-
-ifeq ($(CROSS_COMPILE),1)
-TOOLCHAIN_PREFIX=$(TARGET)-
-else
-TOOLCHAIN_PREFIX=
-endif
-
-CC = $(TOOLCHAIN_PREFIX)gcc
+CC = gcc
 LINKER = $(CC)
-WINDRES = $(TOOLCHAIN_PREFIX)windres
+WINDRES = windres
 
-STRIP = $(TOOLCHAIN_PREFIX)strip
+STRIP = strip
 
 #CPUFLAGS= -mtune=i686
 #CPUFLAGS= -march=pentium4
diff --git a/Quake/Makefile.w64 b/Quake/Makefile.w64
index dfdb2659..29b9d22b 100644
--- a/Quake/Makefile.w64
+++ b/Quake/Makefile.w64
@@ -1,9 +1,9 @@
-# GNU Makefile for cross-compiling quakespasm.exe (Win64: MinGW-w64)
-# using cross-toolchains on a linux host, Sep. 10, 2014
+# GNU Makefile for compiling Win64 quakespasm.exe using MinGW-w64.
+# Usage: "make -f Makefile.w64"
+# To cross-compile on Linux hosts, see the "build_cross_win32*.sh" scripts.
 # "make DEBUG=1" to build a debug client.
-# "make SDL_CONFIG=/path/to/sdl-config" for unusual SDL installations.
-# "make WINSOCK2=0" to use the old WinSock 1.1 api (NOT recommended).
-# "make CROSS_COMPILE=0" to build natively on windows with mingw and msys
+# "make SDL_CONFIG=/path/to/sdl-config" to override the locally included SDL versions.
+# "make WINSOCK2=0" to use the old WinSock 1.1 api (NOT RECOMMENDED)
 
 ### Enable/disable SDL2
 USE_SDL2=0
@@ -39,21 +39,11 @@ WINSOCK2?= 1
 # build variables
 # ---------------------------
 
-TARGET=x86_64-w64-mingw32
-
-CROSS_COMPILE=1
-
-ifeq ($(CROSS_COMPILE),1)
-TOOLCHAIN_PREFIX=$(TARGET)-
-else
-TOOLCHAIN_PREFIX=
-endif
-
-CC = $(TOOLCHAIN_PREFIX)gcc
+CC = gcc
 LINKER = $(CC)
-WINDRES = $(TOOLCHAIN_PREFIX)windres
+WINDRES = windres
 
-STRIP = $(TOOLCHAIN_PREFIX)strip
+STRIP = strip
 
 CPUFLAGS=
 LDFLAGS =