diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac891c79..8a2966fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,5 @@
 project(pip)
 cmake_minimum_required(VERSION 2.6)
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 include(CheckFunctionExists)
@@ -37,9 +36,12 @@ option(USB "USB support" OFF)
 option(STL "Building with STL containers" OFF)
 option(CRYPT "Crypt support" OFF)
 option(LIB "System install" ON)
+option(DEBUG "Build with -g3" OFF)
 set(CMAKE_BUILD_TYPE "Release")
 set(LIBS)
-
+if (DEBUG)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
+endif ()
 
 # Sources
 set(PIP_FOLDERS "." "core" "containers" "thread" "system" "io" "console" "math" "code" "geo")