diff --git a/build/config-macos10.6-icl-x86.py b/build/config-macos10.6-icl-x86.py
index 5ce25718..7e2df872 100644
--- a/build/config-macos10.6-icl-x86.py
+++ b/build/config-macos10.6-icl-x86.py
@@ -4,7 +4,7 @@ CXX            = 'icpc'
 CC             = 'icc'
 CCFLAGS        = ['-arch', 'i386', '-mmacosx-version-min=10.6', '-mfpmath=sse', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk', '-O3', '-ipo', '-no-prec-div', '-xSSE3', '-fp-model', 'fast=2', '-openmp', '-wd279', '-wd1875', '-Wall', '-g', '-pipe', '-DMTS_DEBUG', '-DSINGLE_PRECISION', '-DSPECTRUM_SAMPLES=3', '-DMTS_SSE', '-DMTS_HAS_COHERENT_RT', '-fvisibility=hidden']
 CXXFLAGS       = ['-std=c++0x']
-LINKFLAGS      = ['-framework', 'OpenGL', '-framework', 'Cocoa', '-arch', 'i386', '-mmacosx-version-min=10.6', '-Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk', '-openmp', '-Wl,-headerpad,128', '-wd11012']
+LINKFLAGS      = ['-g', '-framework', 'OpenGL', '-framework', 'Cocoa', '-arch', 'i386', '-mmacosx-version-min=10.6', '-Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk', '-openmp', '-Wl,-headerpad,128', '-wd11012']
 BASEINCLUDE    = ['#include', '#dependencies/include']
 BASELIBDIR     = ['#dependencies/lib']
 BASELIB        = ['m', 'pthread', 'gomp', 'Half']
diff --git a/build/config-macos10.6-icl-x86_64.py b/build/config-macos10.6-icl-x86_64.py
index bd58029c..9801e511 100644
--- a/build/config-macos10.6-icl-x86_64.py
+++ b/build/config-macos10.6-icl-x86_64.py
@@ -4,7 +4,7 @@ CXX            = 'icpc'
 CC             = 'icc'
 CCFLAGS        = ['-arch', 'x86_64', '-mmacosx-version-min=10.6', '-mfpmath=sse', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk', '-O3', '-ipo', '-xSSSE3', '-fp-model', 'fast=2', '-openmp', '-wd279', '-wd1875', '-Wall', '-g', '-pipe', '-DMTS_DEBUG', '-DSINGLE_PRECISION', '-DSPECTRUM_SAMPLES=3', '-DMTS_SSE', '-DMTS_HAS_COHERENT_RT', '-fvisibility=hidden']
 CXXFLAGS       = ['-std=c++0x']
-LINKFLAGS      = ['-framework', 'OpenGL', '-framework', 'Cocoa', '-arch', 'x86_64', '-mmacosx-version-min=10.6', '-Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk', '-openmp', '-Wl,-headerpad,128', '-wd11012']
+LINKFLAGS      = ['-g', '-framework', 'OpenGL', '-framework', 'Cocoa', '-arch', 'x86_64', '-mmacosx-version-min=10.6', '-Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk', '-openmp', '-Wl,-headerpad,128', '-wd11012']
 BASEINCLUDE    = ['#include', '#dependencies/include']
 BASELIBDIR     = ['#dependencies/lib']
 BASELIB        = ['m', 'pthread', 'gomp', 'Half']
diff --git a/build/config-macos10.7-icl-x86.py b/build/config-macos10.7-icl-x86.py
index 7e565bee..3b9ae051 100644
--- a/build/config-macos10.7-icl-x86.py
+++ b/build/config-macos10.7-icl-x86.py
@@ -4,7 +4,7 @@ CXX            = 'icpc'
 CC             = 'icc'
 CCFLAGS        = ['-arch', 'i386', '-mmacosx-version-min=10.7', '-mfpmath=sse', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk', '-O3', '-ipo', '-no-prec-div', '-xSSE3', '-fp-model', 'fast=2', '-openmp', '-wd279', '-wd1875', '-Wall', '-g', '-pipe', '-DMTS_DEBUG', '-DSINGLE_PRECISION', '-DSPECTRUM_SAMPLES=3', '-DMTS_SSE', '-DMTS_HAS_COHERENT_RT', '-fvisibility=hidden']
 CXXFLAGS       = ['-std=c++0x']
-LINKFLAGS      = ['-framework', 'OpenGL', '-framework', 'Cocoa', '-arch', 'i386', '-mmacosx-version-min=10.7', '-Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk', '-openmp', '-Wl,-headerpad,128', '-wd11012']
+LINKFLAGS      = ['-g', '-framework', 'OpenGL', '-framework', 'Cocoa', '-arch', 'i386', '-mmacosx-version-min=10.7', '-Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk', '-openmp', '-Wl,-headerpad,128', '-wd11012']
 BASEINCLUDE    = ['#include', '#dependencies/include']
 BASELIBDIR     = ['#dependencies/lib']
 BASELIB        = ['m', 'pthread', 'gomp', 'Half']
diff --git a/build/config-macos10.7-icl-x86_64.py b/build/config-macos10.7-icl-x86_64.py
index 3ad0861e..45a433d8 100644
--- a/build/config-macos10.7-icl-x86_64.py
+++ b/build/config-macos10.7-icl-x86_64.py
@@ -4,7 +4,7 @@ CXX            = 'icpc'
 CC             = 'icc'
 CCFLAGS        = ['-arch', 'x86_64', '-mmacosx-version-min=10.7', '-mfpmath=sse', '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk', '-O3', '-ipo', '-xSSSE3', '-fp-model', 'fast=2', '-openmp', '-wd279', '-wd1875', '-Wall', '-g', '-pipe', '-DMTS_DEBUG', '-DSINGLE_PRECISION', '-DSPECTRUM_SAMPLES=3', '-DMTS_SSE', '-DMTS_HAS_COHERENT_RT', '-fvisibility=hidden']
 CXXFLAGS       = ['-std=c++0x']
-LINKFLAGS      = ['-framework', 'OpenGL', '-framework', 'Cocoa', '-arch', 'x86_64', '-mmacosx-version-min=10.7', '-Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk', '-openmp', '-Wl,-headerpad,128', '-wd11012']
+LINKFLAGS      = ['-g', '-framework', 'OpenGL', '-framework', 'Cocoa', '-arch', 'x86_64', '-mmacosx-version-min=10.7', '-Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk', '-openmp', '-Wl,-headerpad,128', '-wd11012']
 BASEINCLUDE    = ['#include', '#dependencies/include']
 BASELIBDIR     = ['#dependencies/lib']
 BASELIB        = ['m', 'pthread', 'gomp', 'Half']
diff --git a/data/darwin/extract-symbols.sh b/data/darwin/extract-symbols.sh
index 52c6a1b6..6ef866d7 100755
--- a/data/darwin/extract-symbols.sh
+++ b/data/darwin/extract-symbols.sh
@@ -1,9 +1,10 @@
+rm -Rf symbols32 symbols64
 dependencies/bin/symbolstore.py -a "i386" dependencies/bin/dump_syms symbols32 \
-	`find build/release -type f -and \( -name *.dylib -or -name mtsgui \)` `find dependencies/lib -type f -name *.dylib`  \
+	`find Mitsuba.app -type f -and \( -name *.dylib -or -name mtsgui -or -name mitsuba -or -name mtsutil \)` \
 	dependencies/frameworks/QtCore.framework/QtCore dependencies/frameworks/QtGui.framework/QtGui dependencies/frameworks/QtNetwork.framework/QtNetwork \
 	dependencies/frameworks/QtXml.framework/QtXml dependencies/frameworks/QtXmlPatterns.framework/QtXmlPatterns dependencies/frameworks/QtOpenGL.framework/QtOpenGL
 
 dependencies/bin/symbolstore.py -a "x86_64" dependencies/bin/dump_syms symbols64 \
-	`find build/release -type f -and \( -name *.dylib -or -name mtsgui \)` `find dependencies/lib -type f -name *.dylib`  \
+	`find Mitsuba.app -type f -and \( -name *.dylib -or -name mtsgui -or -name mitsuba -or -name mtsutil \)` \
 	dependencies/frameworks/QtCore.framework/QtCore dependencies/frameworks/QtGui.framework/QtGui dependencies/frameworks/QtNetwork.framework/QtNetwork \
 	dependencies/frameworks/QtXml.framework/QtXml dependencies/frameworks/QtXmlPatterns.framework/QtXmlPatterns dependencies/frameworks/QtOpenGL.framework/QtOpenGL