diff --git a/SConstruct b/SConstruct
index bc491edbbc..5e37b5bfb4 100644
--- a/SConstruct
+++ b/SConstruct
@@ -29,7 +29,7 @@ opts.AddOptions(
     ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''),
     BoolOption('AUDIOUNITS', 'Compile with Apple\'s AudioUnit library. (experimental)', 0),
     BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library', 0),
-    BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0),
+    BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 1),
     PathOption('DESTDIR', 'Set the intermediate install "prefix"', '/'),
     EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'none' ), ignorecase=2),
     BoolOption('DMALLOC', 'Compile and link using the dmalloc library', 0),
diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in
index 6017dcdba4..00d4998eb6 100644
--- a/gtk2_ardour/ardev_common.sh.in
+++ b/gtk2_ardour/ardev_common.sh.in
@@ -14,3 +14,5 @@ export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
 export GTK_PATH=$PWD/libs/clearlooks:~/.ardour2
 
 EXECUTABLE=gtk2_ardour/ardour-%VERSION%
+
+ulimit -c unlimited
diff --git a/gtk2_ardour/ardour.sh.in b/gtk2_ardour/ardour.sh.in
index c661467d01..beed436cbe 100644
--- a/gtk2_ardour/ardour.sh.in
+++ b/gtk2_ardour/ardour.sh.in
@@ -13,6 +13,8 @@ if [ "$MLOCK_LIMIT" != "unlimited" ]; then
 
 fi
 
+ulimit -c unlimited
+
 exec %INSTALL_PREFIX%/%LIBDIR%/ardour2/ardour-%VERSION% $*