diff --git a/SConstruct b/SConstruct
index 7fdaca4c7b..5b29895c3c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -71,8 +71,12 @@ else:
                      env['BOOST_LIBS']]
 
 platform_libs = []
+tls_libs = []
 if env['PLATFORM'] == 'posix':
    platform_libs = ['pthread', 'rt']
+   tls_libs = ['ssl', 'crypto']
+elif env['PLATFORM'] == 'darwin':
+   tls_libs = ['ssl', 'crypto']
 elif env['PLATFORM'].startswith('win'):
    # Win/VC++ supports autolinking. nothing to do.
    pass
@@ -85,6 +89,7 @@ builddir = releasedir
 Export('env')
 Export('platform_libs')
 Export('boostlibs')
+Export('tls_libs')
 
 ## END OF CONFIG !!
 
@@ -105,6 +110,10 @@ echo_server = SConscript('#/examples/echo_server/SConscript',
                          variant_dir = builddir + 'echo_server',
                          duplicate = 0)
 
+echo_server_tls = SConscript('#/examples/echo_server_tls/SConscript',
+                         variant_dir = builddir + 'echo_server_tls',
+                         duplicate = 0)
+
 echo_client = SConscript('#/examples/echo_client/SConscript',
                          variant_dir = builddir + 'echo_client',
                          duplicate = 0)
@@ -116,3 +125,9 @@ chat_client = SConscript('#/examples/chat_client/SConscript',
 chat_server = SConscript('#/examples/chat_server/SConscript',
                          variant_dir = builddir + 'chat_server',
                          duplicate = 0)
+
+concurrent_server = SConscript('#/examples/concurrent_server/SConscript',
+                         variant_dir = builddir + 'concurrent_server',
+                         duplicate = 0)
+
+
diff --git a/examples/concurrent_server/SConscript b/examples/concurrent_server/SConscript
new file mode 100644
index 0000000000..6e526bbcdf
--- /dev/null
+++ b/examples/concurrent_server/SConscript
@@ -0,0 +1,20 @@
+## concurrent_server.cpp
+##
+
+Import('env')
+Import('boostlibs')
+Import('wslib')
+Import('platform_libs')
+
+localenv = env.Clone ()
+
+sources = ["concurrent_server.cpp"]
+
+LIBS = [wslib, platform_libs] + boostlibs(['system',
+                                           'date_time',
+                                           'regex',
+                                           'thread'])
+
+prg = localenv.Program('concurrent_server', sources, LIBS = LIBS)
+
+Return('prg')
diff --git a/examples/concurrent_server/concurrent_server.cpp b/examples/concurrent_server/concurrent_server.cpp
index 9a072230bb..d865094166 100644
--- a/examples/concurrent_server/concurrent_server.cpp
+++ b/examples/concurrent_server/concurrent_server.cpp
@@ -183,7 +183,7 @@ int main(int argc, char* argv[]) {
         echo_endpoint.alog().unset_level(websocketpp::log::alevel::ALL);
         echo_endpoint.elog().unset_level(websocketpp::log::elevel::ALL);
         
-        echo_endpoint.elog().set_level(websocketpp::log::elevel::ERROR);
+        echo_endpoint.elog().set_level(websocketpp::log::elevel::RERROR);
         echo_endpoint.elog().set_level(websocketpp::log::elevel::FATAL);
         
         std::list<boost::shared_ptr<boost::thread> > threads;
diff --git a/examples/echo_server_tls/SConscript b/examples/echo_server_tls/SConscript
new file mode 100644
index 0000000000..6f2f5434a6
--- /dev/null
+++ b/examples/echo_server_tls/SConscript
@@ -0,0 +1,21 @@
+## echo_server_tls
+##
+
+Import('env')
+Import('boostlibs')
+Import('wslib')
+Import('platform_libs')
+Import('tls_libs')
+
+localenv = env.Clone ()
+
+sources = ["echo_server_tls.cpp"]
+
+LIBS = [wslib, platform_libs, tls_libs] + boostlibs(['system',
+                                                     'date_time',
+                                                     'regex',
+                                                     'thread'])
+
+prg = localenv.Program('echo_server_tls', sources, LIBS = LIBS)
+
+Return('prg')
diff --git a/examples/echo_server_tls/echo_server_tls b/examples/echo_server_tls/echo_server_tls
deleted file mode 100755
index 255d92b471..0000000000
Binary files a/examples/echo_server_tls/echo_server_tls and /dev/null differ
diff --git a/websocketpp.xcodeproj/project.pbxproj b/websocketpp.xcodeproj/project.pbxproj
index 49cbc24541..fbab57b02a 100644
--- a/websocketpp.xcodeproj/project.pbxproj
+++ b/websocketpp.xcodeproj/project.pbxproj
@@ -280,6 +280,8 @@
 		B64975A21510B54900BE17D1 /* SConscript */ = {isa = PBXFileReference; lastKnownFileType = text; name = SConscript; path = examples/chat_server/SConscript; sourceTree = "<group>"; };
 		B64975A31510B55600BE17D1 /* SConscript */ = {isa = PBXFileReference; lastKnownFileType = text; name = SConscript; path = examples/chat_client/SConscript; sourceTree = "<group>"; };
 		B64975A41510B62700BE17D1 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; name = Makefile; path = examples/chat_client/Makefile; sourceTree = "<group>"; };
+		B64975A51510B86B00BE17D1 /* SConscript */ = {isa = PBXFileReference; lastKnownFileType = text; path = SConscript; sourceTree = "<group>"; };
+		B64975A61510B8D900BE17D1 /* SConscript */ = {isa = PBXFileReference; lastKnownFileType = text; name = SConscript; path = examples/echo_server_tls/SConscript; sourceTree = "<group>"; };
 		B64E12D214BDE132006F20F0 /* logging.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = logging.cpp; sourceTree = "<group>"; };
 		B64E12D314BDE132006F20F0 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
 		B64E12D414BDE132006F20F0 /* parsing.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = parsing.cpp; sourceTree = "<group>"; };
@@ -572,6 +574,7 @@
 				B61A51B714DC207600456432 /* concurrent_client.html */,
 				B61A51B814DC207600456432 /* concurrent_server.cpp */,
 				B61A51B914DC207600456432 /* Makefile */,
+				B64975A51510B86B00BE17D1 /* SConscript */,
 			);
 			name = concurrent_server;
 			path = examples/concurrent_server;
@@ -633,6 +636,7 @@
 			children = (
 				B66388451487D71800DDAE13 /* echo_server_tls.cpp */,
 				B66388461487D71800DDAE13 /* Makefile */,
+				B64975A61510B8D900BE17D1 /* SConscript */,
 			);
 			name = echo_server_tls;
 			sourceTree = "<group>";