diff --git a/Quake/Makefile b/Quake/Makefile
index 3f098f83..bd0a2cd3 100644
--- a/Quake/Makefile
+++ b/Quake/Makefile
@@ -6,7 +6,6 @@
 # You'll need SDL and SDL_net fully installed.
 # "make DEBUG=1" builds debug client
 # "make SDL_CONFIG=/path/to/sdl-config" for unusual SDL installations
-# "make AMD64=1" for a 64 bit binary on 64 bit cpus (disabled by default, broken)
 #
 # 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"
@@ -54,9 +53,15 @@ CC ?= gcc
 WINDRES ?= windres
 STRIP ?= strip
 
+#CPUFLAGS= -mtune=i686
+#CPUFLAGS= -march=pentium4
+#CPUFLAGS= -mtune=k8
+#CPUFLAGS= -march=atom
+CPUFLAGS= 
 DFLAGS ?=
 CFLAGS ?= -Wall -Wno-trigraphs
 # CFLAGS += -Werror
+CFLAGS += $(CPUFLAGS)
 
 ifneq ($(DEBUG),0)
 DFLAGS += -DDEBUG
@@ -68,19 +73,9 @@ DFLAGS += -DNDEBUG
 CFLAGS += -O2
 CFLAGS += $(call check_gcc,-fweb,)
 CFLAGS += $(call check_gcc,-frename-registers,)
-CFLAGS += $(call check_gcc,-mtune=i686,-mcpu=i686)
 STRIP_CMD := $(STRIP)
 endif
 
-### 64 bit disabled unless AMD64=1
-# FIXME: do a better string searchng here!!
-ifneq (,$(findstring 64,$(shell uname -p)))
-ifeq ($(AMD64),)
-CFLAGS += -m32
-LFLAGS += -m32
-endif
-endif
-
 ### X11BASE only gets used if its in an unusual place
 
 X11DIRS := /usr/X11R7 /usr/local/X11R7 /usr/X11R6 /usr/local/X11R6
diff --git a/Quake/Makefile.w32 b/Quake/Makefile.w32
index 9c0c1450..db2f8047 100644
--- a/Quake/Makefile.w32
+++ b/Quake/Makefile.w32
@@ -23,9 +23,13 @@ CC = i686-pc-mingw32-gcc
 WINDRES = i686-pc-mingw32-windres
 STRIP = i686-pc-mingw32-strip
 
+#CPUFLAGS= -mtune=i686
+#CPUFLAGS= -march=pentium4
+CPUFLAGS= 
 DFLAGS ?=
 CFLAGS ?= -Wall -Wno-trigraphs
 # CFLAGS += -Werror
+CFLAGS += $(CPUFLAGS)
 
 ifneq ($(DEBUG),0)
 DFLAGS += -DDEBUG
@@ -37,7 +41,6 @@ DFLAGS += -DNDEBUG
 CFLAGS += -O2
 CFLAGS += $(call check_gcc,-fweb,)
 CFLAGS += $(call check_gcc,-frename-registers,)
-CFLAGS += $(call check_gcc,-mtune=i686,-mcpu=i686)
 STRIP_CMD := $(STRIP)
 endif