diff --git a/SConstruct b/SConstruct
index 0cea9f87bf..20fbf20bca 100644
--- a/SConstruct
+++ b/SConstruct
@@ -79,6 +79,8 @@ elif env['PLATFORM'] == 'posix':
    env.Append(CCFLAGS = ['-Wall'])
    #env['LINKFLAGS'] = ''
 elif env['PLATFORM'] == 'darwin':
+   if not os.environ.has_key('CXX'):
+      env['CXX'] = "clang++"
    if env.has_key('DEBUG'):
       env.Append(CCFLAGS = ['-g', '-O0'])
    else:
diff --git a/changelog.md b/changelog.md
index c4cdcca7ca..572f211d19 100644
--- a/changelog.md
+++ b/changelog.md
@@ -46,6 +46,8 @@ HEAD
   endpoints to new connections.
 - Compatibility: Fix compile time conflict with Visual Studio's MIN/MAX macros. Thank you
   Robin Rowe for reporting.
+- Documentation: Examples and test suite build system now defaults to clang on
+  OS X
 
 0.3.0-alpha4 - 2013-10-11
 - HTTP requests ending normally are no longer logged as errors. Thank you Banaan