diff --git a/Quake/Makefile b/Quake/Makefile
index 9ca66e58..0c70fc9d 100644
--- a/Quake/Makefile
+++ b/Quake/Makefile
@@ -44,11 +44,10 @@ STRIP ?= strip
 #CPUFLAGS= -march=pentium4
 #CPUFLAGS= -mtune=k8
 #CPUFLAGS= -march=atom
-CPUFLAGS= 
-LDFLAGS = 
+CPUFLAGS=
+LDFLAGS =
 DFLAGS ?=
 CFLAGS ?= -Wall -Wno-trigraphs
-# CFLAGS += -Werror
 CFLAGS += $(CPUFLAGS)
 
 ifneq ($(DEBUG),0)
diff --git a/Quake/Makefile.darwin b/Quake/Makefile.darwin
index ce8ed196..f7555c81 100644
--- a/Quake/Makefile.darwin
+++ b/Quake/Makefile.darwin
@@ -1,4 +1,4 @@
-# GNU Makefile for QuakeSpasm for Mac OS X, Sep. 03, 2012.
+# GNU Makefile for QuakeSpasm for Mac OS X, Sep. 05, 2012.
 # Usage: "make -f Makefile.darwin"
 # You need the SDL library fully installed.
 # "make DEBUG=1" to build a debug client.
@@ -43,20 +43,19 @@ LIPO ?= lipo
 
 STRIP ?= strip
 
-CPUFLAGS= 
-LDFLAGS = 
+CPUFLAGS=
+LDFLAGS =
+DFLAGS ?=
+CFLAGS ?= -Wall
 # require 10.5 for 64 bit builds
 ifeq ($(MACH_TYPE),x86_64)
-CPUFLAGS+=-mmacosx-version-min=10.5
+CFLAGS  +=-mmacosx-version-min=10.5
 LDFLAGS +=-mmacosx-version-min=10.5
 endif
 ifeq ($(MACH_TYPE),ppc64)
-CPUFLAGS+=-mmacosx-version-min=10.5
+CFLAGS  +=-mmacosx-version-min=10.5
 LDFLAGS +=-mmacosx-version-min=10.5
 endif
-DFLAGS ?=
-CFLAGS ?= -Wall
-# CFLAGS += -Werror
 CFLAGS += $(CPUFLAGS)
 
 ifneq ($(DEBUG),0)
diff --git a/Quake/Makefile.w32 b/Quake/Makefile.w32
index 3bfae3d2..b24c1ca1 100644
--- a/Quake/Makefile.w32
+++ b/Quake/Makefile.w32
@@ -53,11 +53,10 @@ STRIP = $(TOOLCHAIN_PREFIX)strip
 
 #CPUFLAGS= -mtune=i686
 #CPUFLAGS= -march=pentium4
-CPUFLAGS= 
-LDFLAGS = 
+CPUFLAGS=
+LDFLAGS =
 DFLAGS ?=
 CFLAGS ?= -Wall -Wno-trigraphs
-# CFLAGS += -Werror
 CFLAGS += $(CPUFLAGS)
 
 ifneq ($(DEBUG),0)
diff --git a/Quake/Makefile.w64 b/Quake/Makefile.w64
index 01d9da0e..bdcf0c70 100644
--- a/Quake/Makefile.w64
+++ b/Quake/Makefile.w64
@@ -53,11 +53,10 @@ STRIP = $(TOOLCHAIN_PREFIX)strip
 
 #CPUFLAGS= -mtune=k8
 #CPUFLAGS= -march=atom
-CPUFLAGS= 
-LDFLAGS = 
+CPUFLAGS=
+LDFLAGS =
 DFLAGS ?=
 CFLAGS ?= -Wall -Wno-trigraphs
-# CFLAGS += -Werror
 CFLAGS += $(CPUFLAGS)
 
 ifneq ($(DEBUG),0)