diff --git a/Makefile b/Makefile
index 5ca403b563..26f06759da 100644
--- a/Makefile
+++ b/Makefile
@@ -38,10 +38,18 @@
 ############################## TOOLCHAIN ###############################
 #
 CSC         = dmcs
-CSFLAGS     = -nologo -warn:4 -debug:pdbonly -optimize+ -codepage:utf8 -unsafe -warnaserror
+CSFLAGS     = -nologo -warn:4 -codepage:utf8 -unsafe -warnaserror
 DEFINE      = TRACE
 COMMON_LIBS = System.dll System.Core.dll System.Data.dll System.Data.DataSetExtensions.dll System.Drawing.dll System.Xml.dll thirdparty/download/ICSharpCode.SharpZipLib.dll thirdparty/download/FuzzyLogicLibrary.dll thirdparty/download/Mono.Nat.dll thirdparty/download/MaxMind.Db.dll thirdparty/download/MaxMind.GeoIP2.dll thirdparty/download/Eluant.dll
 
+DEBUG = true
+ifeq ($(DEBUG), $(filter $(DEBUG),false no n off 0))
+CSCFLAGS  += -debug:pdbonly -optimize+
+else
+CSCFLAGS  += -debug:full -optimize-
+DEFINE    := DEBUG;$(DEFINE)
+endif
+
 
 
 ######################### UTILITIES/SETTINGS ###########################