diff --git a/CHANGELOG.md b/CHANGELOG.md
index 515988fb..1360165c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+1.0.0-b24
+
+* bjam use clang on MACOSX
+
+--------------------------------------------------------------------------------
+
 1.0.0-b23
 
 * Tune websocket echo server for performance
@@ -5,7 +11,7 @@
 * Better logging in async echo server
 * Add copy special members
 * Fix message constructor and special members
-* Travis CI improvements 
+* Travis CI improvements
 
 --------------------------------------------------------------------------------
 
diff --git a/Jamroot b/Jamroot
index 1f827853..54330523 100644
--- a/Jamroot
+++ b/Jamroot
@@ -45,6 +45,11 @@ else
   lib crypto ;
 }
 
+if [ os.name ] = MACOSX
+{
+  using clang : : ;
+}
+
 variant coverage
   :
     debug