diff --git a/Makefile.win b/Makefile.win
index 9f282a6e90..d64ee4a462 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -32,7 +32,6 @@ libretro ?= -lretro
 LIBS = -lm
 DEFINES = -I. -DHAVE_CONFIGFILE -DHAVE_SDL -DHAVE_SCREENSHOTS -DHAVE_BSV_MOVIE -DPACKAGE_VERSION=\"0.9.6\"
 LDFLAGS = -L. -static-libgcc
-LDCXXFLAGS = -s
 
 ifeq ($(TDM_GCC),)
    LDCXXFLAGS += -static-libstdc++
@@ -153,6 +152,13 @@ ifneq ($(V), 1)
    Q := @
 endif
 
+ifeq ($(DEBUG), 1)
+   CFLAGS += -O0 -g
+else
+   CFLAGS += -O3
+   LDCXXFLAGS += -s
+endif
+
 CFLAGS += -Wall -Wno-unused-result -O3 -I.
 ifeq ($(CXX_BUILD), 1)
    CFLAGS += -std=c++0x -xc++ -D__STDC_CONSTANT_MACROS