diff --git a/Quake/Makefile b/Quake/Makefile
index bd0a2cd3..9715be2c 100644
--- a/Quake/Makefile
+++ b/Quake/Makefile
@@ -1,14 +1,11 @@
-
-# Hacked Makefile for fitzquake_sdl_20100125 by Ozkan & Steven, Jan. 31, 2010
-# Tested on Fedora-7, Fedora-6_amd64, FreeBSD-7.0. Untested on MacOSX, Win32
+# GNU Makefile for QuakeSpasm, Feb. 18, 2010
 #
-# To do it, just move this file to "fitzquake_sdl_20100125/Quake", and "make"
-# You'll need SDL and SDL_net fully installed.
+# You need SDL and SDL_net fully installed.
 # "make DEBUG=1" builds debug client
 # "make SDL_CONFIG=/path/to/sdl-config" for unusual SDL installations
 #
-# Currently build objects are separate from those of codeblocks, but this may change.
-# FreeBSD users may have to mess with include directories and also "-nosound"
+# Build objects are separate from those of codeblocks for now
+# (we aren't using codeblocks).
 
 # ============================================================================
 
@@ -112,7 +109,7 @@ LIBS := $(patsubst %,-l%,$(COMMON_LIBS) $(SDL_LIBS))
 
 .PHONY:	clean debug release
 
-DEFAULT_TARGET := fitzquake
+DEFAULT_TARGET := quakespasm
 
 # ---------------------------
 # rules
@@ -122,7 +119,7 @@ DEFAULT_TARGET := fitzquake
 	$(CC) $(DFLAGS) -c $(CFLAGS) $(X11_CFLAGS) $(SDL_CFLAGS) -o $@ $^
 
 # ----------------------------------------------------------------------------
-# FitzQuake SDL objects
+# objects
 # ----------------------------------------------------------------------------
 
 OBJS := \
@@ -140,16 +137,16 @@ common.o    gl_rlight.o  host_cmd.o   net_loop.o  r_brush.o     sv_main.o
 # build rules for Linux
 # ------------------------
 
-fitzquake:	$(OBJS)
-	$(CC) $(CFLAGS) -o fitzquake $(OBJS) $(X11_LFLAGS) $(SDL_LFLAGS) $(LIBS)
+quakespasm:	$(OBJS)
+	$(CC) $(CFLAGS) -o quakespasm $(OBJS) $(X11_LFLAGS) $(SDL_LFLAGS) $(LIBS)
 	$(STRIP_CMD) $@
 
-release:	fitzquake
+release:	quakespasm
 debug:
 	$(error Use "make DEBUG=1")
 
-install:	fitzquake
-	mv fitzquake /usr/local/games/quake
+install:	quakespasm
+	mv quakespasm /usr/local/games/quake
 
 clean:
 	rm -f $(shell find . \( -name '*~' -o -name '#*#' -o -name '*.o' -o -name '*.res' -o -name $(DEFAULT_TARGET) \) -print)
diff --git a/Quake/Makefile.w32 b/Quake/Makefile.w32
index 6c65e53c..38b84af2 100644
--- a/Quake/Makefile.w32
+++ b/Quake/Makefile.w32
@@ -1,5 +1,5 @@
-# GNU Makefile for cross-compiling fitzquake.exe (Win32 : MinGW)
-# using cross-toolchains on a linux host	/ Jan. 31, 2010
+# GNU Makefile for cross-compiling quakespasm.exe (Win32 : MinGW)
+# using cross-toolchains on a linux host	/ Feb. 18, 2010.
 # "make DEBUG=1" builds debug client
 # "make SDL_CONFIG=/path/to/sdl-config" for sdl-config from cross-compiled SDL
 
@@ -62,7 +62,7 @@ LIBS := $(patsubst %,-l%,$(COMMON_LIBS) $(SDL_LIBS))
 
 .PHONY:	clean debug release
 
-DEFAULT_TARGET := fitzquake.exe
+DEFAULT_TARGET := quakespasm.exe
 
 # ---------------------------
 # rules
@@ -74,7 +74,7 @@ DEFAULT_TARGET := fitzquake.exe
 	$(WINDRES) --output-format=coff -I../Windows -o $@ $^
 
 # ----------------------------------------------------------------------------
-# FitzQuake SDL objects
+# objects
 # ----------------------------------------------------------------------------
 
 OBJS := \
@@ -92,11 +92,11 @@ common.o    gl_rlight.o  host_cmd.o   net_loop.o  r_brush.o     sv_main.o   Fitz
 # build rules for mingw :
 # ------------------------
 
-fitzquake.exe:	$(OBJS)
-	$(CC) $(CFLAGS) -o fitzquake.exe $(OBJS) $(SDL_LFLAGS) $(LIBS)
-	$(STRIP_CMD) fitzquake.exe
+quakespasm.exe:	$(OBJS)
+	$(CC) $(CFLAGS) -o quakespasm.exe $(OBJS) $(SDL_LFLAGS) $(LIBS)
+	$(STRIP_CMD) quakespasm.exe
 
-release:	fitzquake.exe
+release:	quakespasm.exe
 debug:
 	$(error Use "make DEBUG=1")
 
diff --git a/Quake/Makefile.w64 b/Quake/Makefile.w64
index 55bda920..0db3f291 100644
--- a/Quake/Makefile.w64
+++ b/Quake/Makefile.w64
@@ -1,5 +1,5 @@
-# GNU Makefile for cross-compiling fitzquake.exe (Win64 : MinGW-w64)
-# using cross-toolchains on a linux host	/ Feb. 17, 2010
+# GNU Makefile for cross-compiling quakespasm.exe (Win64 : MinGW-w64)
+# using cross-toolchains on a linux host	/ Feb. 18, 2010.
 # "make DEBUG=1" builds debug client
 # "make SDL_CONFIG=/path/to/sdl-config" for sdl-config from cross-compiled SDL
 
@@ -62,7 +62,7 @@ LIBS := $(patsubst %,-l%,$(COMMON_LIBS) $(SDL_LIBS))
 
 .PHONY:	clean debug release
 
-DEFAULT_TARGET := fitzquake.exe
+DEFAULT_TARGET := quakespasm.exe
 
 # ---------------------------
 # rules
@@ -74,7 +74,7 @@ DEFAULT_TARGET := fitzquake.exe
 	$(WINDRES) --output-format=coff -I../Windows -o $@ $^
 
 # ----------------------------------------------------------------------------
-# FitzQuake SDL objects
+# objects
 # ----------------------------------------------------------------------------
 
 OBJS := \
@@ -89,14 +89,14 @@ cmd.o       gl_refrag.o  gl_warp.o    net_dgrm.o  r_alias.o     snd_sdl.o   zone
 common.o    gl_rlight.o  host_cmd.o   net_loop.o  r_brush.o     sv_main.o   Fitzquake.res
 
 # ------------------------
-# build rules for mingw :
+# build rules for mingw-w64 :
 # ------------------------
 
-fitzquake.exe:	$(OBJS)
-	$(CC) $(CFLAGS) -o fitzquake.exe $(OBJS) $(SDL_LFLAGS) $(LIBS)
-	$(STRIP_CMD) fitzquake.exe
+quakespasm.exe:	$(OBJS)
+	$(CC) $(CFLAGS) -o quakespasm.exe $(OBJS) $(SDL_LFLAGS) $(LIBS)
+	$(STRIP_CMD) quakespasm.exe
 
-release:	fitzquake.exe
+release:	quakespasm.exe
 debug:
 	$(error Use "make DEBUG=1")