diff --git a/tools/wafadmin/Tools/node_addon.py b/tools/wafadmin/Tools/node_addon.py
index 4fa1e006d1..b308d40f3b 100644
--- a/tools/wafadmin/Tools/node_addon.py
+++ b/tools/wafadmin/Tools/node_addon.py
@@ -36,3 +36,7 @@ def detect(conf):
 
   found = os.path.exists(join(prefix, "bin/node"))
   conf.check_message('node prefix', '', found, prefix)
+
+  ## On Mac OSX we need to use mac bundles
+  if Options.platform == 'darwin': conf.check_tool('osx')
+