diff --git a/src/security/key-chain.hpp b/src/security/key-chain.hpp
index 86589eb..ca732d8 100644
--- a/src/security/key-chain.hpp
+++ b/src/security/key-chain.hpp
@@ -476,7 +476,7 @@
 
 
 
-#ifdef NDN_CPP_HAVE_OSX_SECURITY
+#if defined(NDN_CPP_HAVE_OSX_SECURITY) and defined(NDN_CPP_WITH_OSX_KEYCHAIN)
 
 namespace ndn
 {
diff --git a/wscript b/wscript
index abbafaf..2fa9d16 100644
--- a/wscript
+++ b/wscript
@@ -30,6 +30,8 @@
                    '''This option may be necessary if home directory is hosted on NFS.''')
     opt.add_option('--with-pch', action='store_true', default=False, dest='with_pch',
                    help='''Try to use precompiled header to speed up compilation (only gcc and clang)''')
+    opt.add_option('--without-osx-keychain', action='store_false', default=True, dest='with_osx_keychain',
+                   help='''On Darwin, do not use OSX keychain as a default TPM''')
 
 def configure(conf):
     conf.load("compiler_c compiler_cxx boost gnu_dirs c_osx openssl cryptopp")
@@ -116,6 +118,13 @@
         conf.define('DISABLE_SQLITE3_FS_LOCKING', 1)
     
     conf.env['WITH_PCH'] = conf.options.with_pch
+
+    if Utils.unversioned_sys_platform () == "darwin":
+        conf.env['WITH_OSX_KEYCHAIN'] = conf.options.with_osx_keychain
+        if conf.options.with_osx_keychain:
+            conf.define('WITH_OSX_KEYCHAIN', 1)
+    else:
+        conf.env['WITH_OSX_KEYCHAIN'] = False
     
     conf.write_config_header('src/ndn-cpp-config.h', define_prefix='NDN_CPP_')