diff --git a/build/config-icl12-darwin-x86.py b/build/config-icl12-darwin-x86.py
index ebdd3475..936037f3 100644
--- a/build/config-icl12-darwin-x86.py
+++ b/build/config-icl12-darwin-x86.py
@@ -2,7 +2,8 @@ BUILDDIR       = '#build/release'
 DISTDIR        = '#Mitsuba.app'
 CXX            = 'icpc'
 CC             = 'icc'
-CXXFLAGS       = ['-arch', 'i386', '-std=c++0x', '-mmacosx-version-min=10.6', '-mfpmath=sse', '-isysroot', '/Developer/SDKs/MacOSX10.6.sdk', '-O3', '-ipo', '-no-prec-div', '-xSSSE3', '-fp-model', 'fast=2', '-openmp', '-wd279', '-Wall', '-g', '-pipe', '-DMTS_DEBUG', '-DSINGLE_PRECISION', '-DSPECTRUM_SAMPLES=3', '-DMTS_SSE', '-DMTS_HAS_COHERENT_RT']
+CCFLAGS        = ['-arch', 'i386', '-mmacosx-version-min=10.6', '-mfpmath=sse', '-isysroot', '/Developer/SDKs/MacOSX10.6.sdk', '-O3', '-ipo', '-no-prec-div', '-xSSSE3', '-fp-model', 'fast=2', '-openmp', '-wd279', '-Wall', '-g', '-pipe']
+CXXFLAGS       = ['$CCFLAGS', '-std=c++0x', '-DMTS_DEBUG', '-DSINGLE_PRECISION', '-DSPECTRUM_SAMPLES=3', '-DMTS_SSE', '-DMTS_HAS_COHERENT_RT']
 LINKFLAGS      = ['-framework', 'OpenGL', '-framework', 'Cocoa', '-arch', 'i386', '-mmacosx-version-min=10.6', '-Wl,-syslibroot,/Developer/SDKs/MacOSX10.6.sdk', '-openmp', '-Wl,-headerpad,128']
 BASEINCLUDE    = ['#include']
 BASELIB        = ['m', 'pthread', 'gomp']
diff --git a/build/config-icl12-darwin-x86_64.py b/build/config-icl12-darwin-x86_64.py
index 79d85651..2c9a6eff 100644
--- a/build/config-icl12-darwin-x86_64.py
+++ b/build/config-icl12-darwin-x86_64.py
@@ -2,7 +2,8 @@ BUILDDIR       = '#build/release'
 DISTDIR        = '#Mitsuba.app'
 CXX            = 'icpc'
 CC             = 'icc'
-CXXFLAGS       = ['-arch', 'x86_64', '-std=c++0x', '-mmacosx-version-min=10.6', '-mfpmath=sse', '-isysroot', '/Developer/SDKs/MacOSX10.6.sdk', '-O3', '-ipo', '-xSSSE3', '-fp-model', 'fast=2', '-openmp', '-wd279', '-Wall', '-g', '-pipe', '-DMTS_DEBUG', '-DSINGLE_PRECISION', '-DSPECTRUM_SAMPLES=3', '-DMTS_SSE', '-DMTS_HAS_COHERENT_RT']
+CCFLAGS        = ['-arch', 'x86_64', '-mmacosx-version-min=10.6', '-mfpmath=sse', '-isysroot', '/Developer/SDKs/MacOSX10.6.sdk', '-O3', '-ipo', '-xSSSE3', '-fp-model', 'fast=2', '-openmp', '-wd279', '-Wall', '-g', '-pipe']
+CXXFLAGS       = ['$CCFLAGS', '-std=c++0x', '-DMTS_DEBUG', '-DSINGLE_PRECISION', '-DSPECTRUM_SAMPLES=3', '-DMTS_SSE', '-DMTS_HAS_COHERENT_RT']
 LINKFLAGS      = ['-framework', 'OpenGL', '-framework', 'Cocoa', '-arch', 'x86_64', '-mmacosx-version-min=10.6', '-Wl,-syslibroot,/Developer/SDKs/MacOSX10.6.sdk', '-openmp', '-Wl,-headerpad,128']
 BASEINCLUDE    = ['#include']
 BASELIB        = ['m', 'pthread', 'gomp']
diff --git a/data/darwin/Mitsuba.dmgCanvas/Disk Image b/data/darwin/Mitsuba.dmgCanvas/Disk Image
deleted file mode 100644
index b3516887..00000000
Binary files a/data/darwin/Mitsuba.dmgCanvas/Disk Image and /dev/null differ
diff --git a/data/darwin/Mitsuba.dmgCanvas/QuickLook/Preview.jpg b/data/darwin/Mitsuba.dmgCanvas/QuickLook/Preview.jpg
deleted file mode 100644
index 6ee662b9..00000000
Binary files a/data/darwin/Mitsuba.dmgCanvas/QuickLook/Preview.jpg and /dev/null differ