diff --git a/tremulous/Makefile b/tremulous/Makefile
index 726e0cb..f24a7ea 100644
--- a/tremulous/Makefile
+++ b/tremulous/Makefile

@@ -269,18 +269,18 @@ ifeq ($(PLATFORM),linux)
     CLIENT_CFLAGS += -DUSE_CODEC_VORBIS
   endif
 
-  OPTIMIZEVM = -O3 -funroll-loops -fomit-frame-pointer
+  OPTIMIZEVM = -g -O3 -funroll-loops -fomit-frame-pointer
   OPTIMIZE = $(OPTIMIZEVM) -ffast-math
 
   ifeq ($(ARCH),x86_64)
-    OPTIMIZEVM = -O3 -fomit-frame-pointer -funroll-loops \
+    OPTIMIZEVM = -g -O3 -fomit-frame-pointer -funroll-loops \
       -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
       -fstrength-reduce
     OPTIMIZE = $(OPTIMIZEVM) -ffast-math
     HAVE_VM_COMPILED = true
   else
   ifeq ($(ARCH),x86)
-    OPTIMIZEVM = -O3 -march=i586 -fomit-frame-pointer \
+    OPTIMIZEVM = -g -O3 -march=i586 -fomit-frame-pointer \
       -funroll-loops -falign-loops=2 -falign-jumps=2 \
       -falign-functions=2 -fstrength-reduce
     OPTIMIZE = $(OPTIMIZEVM) -ffast-math
@@ -474,7 +474,7 @@ ifeq ($(PLATFORM),mingw32)
     CLIENT_CFLAGS += -DUSE_CODEC_VORBIS
   endif
 
-  OPTIMIZEVM = -O3 -march=i586 -fno-omit-frame-pointer \
+  OPTIMIZEVM = -g -O3 -march=i586 -fno-omit-frame-pointer \
     -falign-loops=2 -funroll-loops -falign-jumps=2 -falign-functions=2 \
     -fstrength-reduce
   OPTIMIZE = $(OPTIMIZEVM) -ffast-math
@@ -556,7 +556,7 @@ ifeq ($(PLATFORM),freebsd)
     CLIENT_CFLAGS += -DUSE_CODEC_VORBIS
   endif
 
-  OPTIMIZEVM = -DNDEBUG -O3 -funroll-loops -fomit-frame-pointer
+  OPTIMIZEVM = -DNDEBUG -g -O3 -funroll-loops -fomit-frame-pointer
 
   ifeq ($(ARCH),axp)
     BASE_CFLAGS += -DNO_VM_COMPILED
@@ -745,7 +745,7 @@ ifeq ($(PLATFORM),sunos)
   CLIENT_CFLAGS = $(SDL_CFLAGS)
   SERVER_CFLAGS =
 
-  OPTIMIZEVM = -O3 -funroll-loops -DNDEBUG
+  OPTIMIZEVM = -g -O3 -funroll-loops -DNDEBUG
 
   ifeq ($(ARCH),sparc)
     OPTIMIZEVM += -O3 \
@@ -787,7 +787,7 @@ else # ifeq sunos
 # SETUP AND BUILD -- GENERIC
 #############################################################################
   BASE_CFLAGS=-DNO_VM_COMPILED
-  OPTIMIZE = -DNDEBUG -O3
+  OPTIMIZE = -DNDEBUG -g -O3
 
   SHLIBEXT=so
   SHLIBCFLAGS=-fPIC