diff --git a/Quake/Makefile b/Quake/Makefile
index 0ae780f5..864ada52 100644
--- a/Quake/Makefile
+++ b/Quake/Makefile
@@ -48,10 +48,6 @@ LINKER = $(CC)
 STRIP ?= strip
 PKG_CONFIG ?= pkg-config
 
-#CPUFLAGS= -mtune=i686
-#CPUFLAGS= -march=pentium4
-#CPUFLAGS= -mtune=k8
-#CPUFLAGS= -march=atom
 CPUFLAGS=
 LDFLAGS =
 DFLAGS ?=
diff --git a/Quake/Makefile.darwin b/Quake/Makefile.darwin
index d7c79fe3..a7dddb1d 100644
--- a/Quake/Makefile.darwin
+++ b/Quake/Makefile.darwin
@@ -36,7 +36,6 @@ check_gcc = $(shell if echo | $(CC) $(1) -Werror -S -o /dev/null -xc - > /dev/nu
 
 # ---------------------------
 
-HOST_OS := $(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]')
 MACH_TYPE= $(shell sh detect.sh arch)
 
 DEBUG   ?= 0
diff --git a/Quake/Makefile.w32 b/Quake/Makefile.w32
index f06f6175..ba8686af 100644
--- a/Quake/Makefile.w32
+++ b/Quake/Makefile.w32
@@ -45,10 +45,8 @@ WINDRES = windres
 
 STRIP = strip
 
-#CPUFLAGS= -mtune=i686
-#CPUFLAGS= -march=pentium4
 CPUFLAGS=
-LDFLAGS = -m32 -mwindows
+LDFLAGS = -m32 -mwindows -static-libgcc
 DFLAGS ?=
 CFLAGS ?= -m32 -Wall -Wno-trigraphs
 CFLAGS += $(CPUFLAGS)
diff --git a/Quake/Makefile.w64 b/Quake/Makefile.w64
index a2efb94b..58282506 100644
--- a/Quake/Makefile.w64
+++ b/Quake/Makefile.w64
@@ -3,7 +3,6 @@
 # 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" 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
@@ -33,7 +32,6 @@ check_gcc = $(shell if echo | $(CC) $(1) -Werror -S -o /dev/null -xc - > /dev/nu
 # ---------------------------
 
 DEBUG   ?= 0
-WINSOCK2?= 1
 
 # ---------------------------
 # build variables
@@ -46,7 +44,7 @@ WINDRES = windres
 STRIP = strip
 
 CPUFLAGS=
-LDFLAGS = -m64 -mwindows
+LDFLAGS = -m64 -mwindows -static-libgcc
 DFLAGS ?=
 CFLAGS ?= -m64 -Wall -Wno-trigraphs
 CFLAGS += $(CPUFLAGS)
@@ -79,13 +77,8 @@ endif
 SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags)
 SDL_LIBS   := $(shell $(SDL_CONFIG) --libs)
 
-ifeq ($(WINSOCK2),1)
 DEFWINSOCK :=-D_USE_WINSOCK2
 LIBWINSOCK := -lws2_32
-else
-DEFWINSOCK :=
-LIBWINSOCK := -lwsock32
-endif
 
 CFLAGS     += $(DEFWINSOCK)
 NET_LIBS   := $(LIBWINSOCK)