diff --git a/satscons/SatSCons.py b/satscons/SatSCons.py
index fee39537a7c5ffe0b371369f0b26d48cf1817406..3fd9a9082778699c40a3ed06dfa068a84720c3a8 100644
--- a/satscons/SatSCons.py
+++ b/satscons/SatSCons.py
@@ -37,7 +37,7 @@ def FinalizeBoost(env):
 
     env.Append(LIBPATH = [ '$BOOST_LIBDIR' ],
                CPPPATH = [ '$BOOST_INCLUDES' ])
-    
+
 def UseSTLPort():
     global opts
     InitOpts()
@@ -80,13 +80,13 @@ def MakeEnvironment():
         finalizer(env)
 
     env.Append(CXXFLAGS = [ '-Wall', '-Woverloaded-virtual', '-Wno-long-long',
-                                 '-pedantic', '-ansi' ],
+                            '-pedantic', '-ansi' ],
                     LOCALLIBDIR = [ '#' ],
                     LIBPATH = [ '$LOCALLIBDIR' ])
 
     if env['final']:
-        env.Append(CXXFLAGS = [ '-O3', '-g' ],
-                        LINKFLAGS = [ '-g' ])
+        env.Append(CXXFLAGS = [ '-O3' ],
+                   CPPDEFINES = [ 'NDEBUG' ])
     else:
         env.Append(CXXFLAGS = [ '-O0', '-g', '-fno-inline' ],
                         LINKFLAGS = [ '-g' ])