diff --git a/src/Makefile.mingw b/src/Makefile.mingw
index 57a504121..cefbc5bdc 100644
--- a/src/Makefile.mingw
+++ b/src/Makefile.mingw
@@ -44,8 +44,11 @@ OPTS	= -DWIN32 $(EXTRAS) $(STUFF)
 ifeq ($(DEBUG), y)
 DFLAGS	= -march=i686 -Og -ggdb -DDEBUG
 else
+ifeq ($(OPTIMIZED), y)
 DFLAGS	= -march=native -mtune=native -O6
-UFLAGS	= -march=i686 -O3
+else
+DFLAGS	= -march=i686 -O3
+endif
 endif
 AFLAGS	= -msse -msse2 -mfpmath=sse
 CFLAGS	= $(OPTS) $(DFLAGS) $(AFLAGS) \
diff --git a/src/Makefile.mingw64 b/src/Makefile.mingw64
index ef7d0ac13..7dfc840ac 100644
--- a/src/Makefile.mingw64
+++ b/src/Makefile.mingw64
@@ -44,8 +44,11 @@ OPTS	= -DWIN32 $(EXTRAS) $(STUFF)
 ifeq ($(DEBUG), y)
 DFLAGS	= -march=i686 -Og -ggdb -DDEBUG
 else
+ifeq ($(OPTIMIZED), y)
 DFLAGS	= -march=native -mtune=native -O6
-UFLAGS	= -O3
+else
+DFLAGS	= -O3
+endif
 endif
 AFLAGS	= -msse -msse2 -mfpmath=sse
 CFLAGS	= $(OPTS) $(DFLAGS) $(AFLAGS) \