diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 74b56b787e..b6df5d5cbb 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -2078,7 +2078,7 @@ Session::save_template (string template_name)
 void
 Session::refresh_disk_space ()
 {
-#if HAVE_SYS_VFS_H && HAVE_SYS_STATVFS_H
+#if __APPLE__ || (HAVE_SYS_VFS_H && HAVE_SYS_STATVFS_H)
 	
 	Glib::Threads::Mutex::Lock lm (space_lock);
 
diff --git a/wscript b/wscript
index 226d71a34e..ee6b7214f9 100644
--- a/wscript
+++ b/wscript
@@ -281,7 +281,7 @@ def set_compiler_flags (conf,opt):
     # a single way to test if we're on OS X
     #
 
-    if conf.env['build_target'] in ['panther', 'tiger', 'leopard' ]:
+    if conf.env['build_target'] in ['panther', 'tiger', 'leopard', 'snowleopard', 'lion', 'mountainlion' ]:
         conf.define ('IS_OSX', 1)
         # force tiger or later, to avoid issues on PPC which defaults
         # back to 10.1 if we don't tell it otherwise.