diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ef2a0562..e125e4785 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,25 +31,30 @@ SET(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share/weechat)
 SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
 STRING(REPLACE "\";\"" "\ " PKG_STRING ${PKG_STRING})
 
-OPTION(DISABLE_NCURSES "Disable Ncurses interface")
-OPTION(ENABLE_GTK      "Enable GTK interface")
-OPTION(DISABLE_NLS     "Disable Native Language Support")
-OPTION(DISABLE_GNUTLS  "Disable SSLv3/TLS connection support")
-OPTION(DISABLE_ALIAS   "Disable Alias plugin")
-OPTION(DISABLE_ASPELL  "Disable Aspell plugin")
-OPTION(DISABLE_CHARSET "Disable Charset plugin")
-OPTION(DISABLE_DEBUG   "Disable Debug plugin")
-OPTION(ENABLE_DEMO     "Enable Demo plugin")
-OPTION(DISABLE_FIFO    "Disable FIFO plugin")
-OPTION(DISABLE_IRC     "Disable IRC plugin")
-OPTION(DISABLE_LOGGER  "Disable Logger plugin")
-OPTION(DISABLE_TRIGGER "Disable Trigger plugin")
-OPTION(DISABLE_SCRIPTS "Disable script plugins")
-OPTION(DISABLE_PERL    "Disable Perl scripting language")
-OPTION(DISABLE_PYTHON  "Disable Python scripting language")
-OPTION(DISABLE_RUBY    "Disable Ruby scripting language")
-OPTION(DISABLE_LUA     "Disable Lua scripting language")
-OPTION(DISABLE_DOC     "Disable Doc")
+OPTION(DISABLE_NCURSES       "Disable Ncurses interface")
+OPTION(ENABLE_GTK            "Enable GTK interface")
+OPTION(DISABLE_NLS           "Disable Native Language Support")
+OPTION(DISABLE_GNUTLS        "Disable SSLv3/TLS connection support")
+OPTION(DISABLE_ALIAS         "Disable Alias plugin")
+OPTION(DISABLE_ASPELL        "Disable Aspell plugin")
+OPTION(DISABLE_CHARSET       "Disable Charset plugin")
+OPTION(DISABLE_DEBUG         "Disable Debug plugin")
+OPTION(ENABLE_DEMO           "Enable Demo plugin")
+OPTION(DISABLE_FIFO          "Disable FIFO plugin")
+OPTION(DISABLE_IRC           "Disable IRC plugin")
+OPTION(DISABLE_LOGGER        "Disable Logger plugin")
+OPTION(DISABLE_TRIGGER       "Disable Trigger plugin")
+OPTION(DISABLE_SCRIPTS       "Disable script plugins")
+OPTION(DISABLE_PERL          "Disable Perl scripting language")
+OPTION(DISABLE_PYTHON        "Disable Python scripting language")
+OPTION(DISABLE_RUBY          "Disable Ruby scripting language")
+OPTION(DISABLE_LUA           "Disable Lua scripting language")
+OPTION(DISABLE_DOC           "Disable Doc")
+OPTION(DISABLE_COMPILE_DEBUG "Disable debug info in object files")
+
+IF(NOT DISABLE_COMPILE_DEBUG)
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
+ENDIF(NOT DISABLE_COMPILE_DEBUG)
 
 ADD_SUBDIRECTORY( po ) 
 ADD_SUBDIRECTORY( src )