diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4ecd9a..a34cf16 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,8 @@ option( ENABLE_EXAMPLES "Install additional tin2rc examples" ON )
 option( ENABLE_RSVG "Rsvg support (launcher only)" ON )
 option( ENABLE_SN "Startup notification support" ON )
 option( ENABLE_ASAN "Build tint2 with AddressSanitizer" OFF )
-option( ENABLE_BACKTRACE "Dump a backtrace in case of fatal errors (e.g. X11 I/O error)" ON )
-option( ENABLE_BACKTRACE_ON_SIGNAL "Dump a backtrace also when receiving signals such as SIGSEGV" ON )
+option( ENABLE_BACKTRACE "Dump a backtrace in case of fatal errors (e.g. X11 I/O error)" OFF )
+option( ENABLE_BACKTRACE_ON_SIGNAL "Dump a backtrace also when receiving signals such as SIGSEGV" OFF )
 if( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
   option( ENABLE_UEVENT "Kernel event handling support" ON )
 endif( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
diff --git a/ChangeLog b/ChangeLog
index e1846b4..06a54b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,9 +3,10 @@
   - Support for NETWM viewports (as in Compiz) (issue #94)
   - The default desktop font (Gtk/FontName from XSettings) is used when a font is not specified in the config file
   - When no fonts are specified in the config, tint2 picks up the default font of the desktop environment via XSettings
-  - Tint2 dumps a stack trace to stderr and ~/.tint2-crash.log in case of a crash;
+  - Tint2 is now able to dump a stack trace to stderr and ~/.tint2-crash.log in case of a crash;
     if the cmake flag ENABLE_BACKTRACE is set, stack traces are dumped on X11 I/O errors;
-    if the cmake flag ENABLE_BACKTRACE_ON_SIGNAL is set, stack traces are dumped also on signals such as SIGSEGV
+	if the cmake flag ENABLE_BACKTRACE_ON_SIGNAL is set, stack traces are dumped also on signals such as SIGSEGV;
+	both ENABLE_BACKTRACE and ENABLE_BACKTRACE_ON_SIGNAL are disabled by default
   - Tint2 attempts to restart itself after a crash, but only if it has been running for more than 30 seconds
   - Pixmaps are cached instead of always redrawn between different button states when mouse effects are enabled,
     to improve performance