diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 5836af03ee..7716ad1fad 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -352,7 +352,7 @@ def build(bld):
     obj.name         = 'libardour'
     obj.target       = 'ardour'
     obj.uselib       = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
-                        'JACK','SNDFILE','SAMPLERATE','LRDF','AUDIOUNIT',
+                        'JACK','SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
                         'OSX','BOOST','CURL','DL']
     obj.use          = ['libpbd','libmidipp','libevoral','libvamphost',
                         'libvampplugin','libtaglib','librubberband',
diff --git a/wscript b/wscript
index 97d33dd103..5d35f815d8 100644
--- a/wscript
+++ b/wscript
@@ -480,15 +480,17 @@ def configure(conf):
 
         conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'AppKit'])
         conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'CoreAudio'])
+        conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'CoreAudioKit'])
         conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'CoreFoundation'])
         conf.env.append_value('LINKFLAGS_OSX', ['-framework', 'CoreServices'])
 
-        conf.env.append_value('LINKFLAGS_OSX', ['-undefined', 'suppress' ])
+        conf.env.append_value('LINKFLAGS_OSX', ['-undefined', 'dynamic_lookup' ])
         conf.env.append_value('LINKFLAGS_OSX', '-flat_namespace')
+        conf.env.append_value('LINKFLAGS_OSX', ['-bind_at_load'])
 
         conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DAUDIOUNIT_SUPPORT")
         conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DAU_STATE_SUPPORT")
-        conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Audiotoolbox', '-framework', 'AudioUnit'])
+        conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Carbon', '-framework', 'Audiotoolbox', '-framework', 'AudioUnit'])
 
     if Options.options.boost_include != '':
         conf.env.append_value('CXXFLAGS', '-I' + Options.options.boost_include)