diff --git a/SConstruct b/SConstruct
index 786232587b..d74514b89c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -17,8 +17,6 @@ warnings = [
 	#'unreachable-code',
 	]
 compileFlags = [
-#	'-g',
-	'-O3',
 	'-fno-strict-aliasing',
 	'-msse2',
 	'-D_FILE_OFFSET_BITS=64',
@@ -74,6 +72,13 @@ if sys.platform == 'darwin':
 
 lib_paths = include_paths
 
+debug = ARGUMENTS.get('debug', 0)
+if int(debug):
+        compileFlags.append('-g')
+        compileFlags.append('-DLOGGING')
+else:
+        compileFlags.append('-O3')
+
 env = Environment(
 	CC = "gcc",
 	CXX = "g++",