diff --git a/platform/osx/detect.py b/platform/osx/detect.py
index fe839199e81..577788d3da3 100644
--- a/platform/osx/detect.py
+++ b/platform/osx/detect.py
@@ -149,8 +149,8 @@ def configure(env):
 
     env.Prepend(CPPPATH=['#platform/osx'])
     env.Append(CPPDEFINES=['OSX_ENABLED', 'UNIX_ENABLED', 'GLES_ENABLED', 'APPLE_STYLE_KEYS', 'COREAUDIO_ENABLED', 'COREMIDI_ENABLED'])
-    env.Append(LINKFLAGS=['-framework', 'Cocoa', '-framework', 'Carbon', '-framework', 'OpenGL', '-framework', 'AGL', '-framework', 'AudioUnit', '-framework', 'CoreAudio', '-framework', 'CoreMIDI', '-lz', '-framework', 'IOKit', '-framework', 'ForceFeedback', '-framework', 'AVFoundation', '-framework', 'CoreMedia', '-framework', 'CoreVideo'])
-    env.Append(LIBS=['pthread'])
+    env.AppendUnique(FRAMEWORKS=['Cocoa', 'Carbon', 'OpenGL', 'AGL', 'AudioUnit', 'CoreAudio', 'CoreMIDI', 'IOKit', 'ForceFeedback', 'AVFoundation', 'CoreMedia', 'CoreVideo'])
+    env.Append(LIBS=['pthread', 'z'])
 
     env.Append(CCFLAGS=['-mmacosx-version-min=10.9'])
     env.Append(LINKFLAGS=['-mmacosx-version-min=10.9'])
diff --git a/platform/server/detect.py b/platform/server/detect.py
index d82df779575..b22b7b33651 100644
--- a/platform/server/detect.py
+++ b/platform/server/detect.py
@@ -224,7 +224,8 @@ def configure(env):
     env.Append(CPPDEFINES=['SERVER_ENABLED', 'UNIX_ENABLED'])
 
     if (platform.system() == "Darwin"):
-        env.Append(LINKFLAGS=['-framework', 'Cocoa', '-framework', 'Carbon', '-lz', '-framework', 'IOKit'])
+        env.AppendUnique(FRAMEWORKS=['Cocoa', 'Carbon', 'IOKit'])
+        env.Append(LIBS=['z'])
 
     env.Append(LIBS=['pthread'])