diff --git a/.travis.yml b/.travis.yml
index 8b975b958..f1527289e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,13 +9,13 @@ matrix:
 
     - env: variant=test_debug lang=cpp11 sim=0 coverage=0 target=osx-tests
       os: osx
-      osx_image: xcode6.4
+      osx_image: xcode7.3
     - env: variant=test_release lang=cpp11 sim=0 coverage=0 docs=1 target=osx-tests
       os: osx
-      osx_image: xcode6.4
+      osx_image: xcode7.3
     - env: variant=test_debug lang=cpp98 sim=0 coverage=0 target=osx-tests
       os: osx
-      osx_image: xcode6.4
+      osx_image: xcode7.3
 
 git:
   submodules: false
@@ -47,14 +47,14 @@ addons:
 
 before_install:
   - git submodule update --init --recursive
-  - if [ $TRAVIS_OS_NAME == "osx" ]; then brew update > /dev/null && brew install --quiet ccache boost-build boost-python; fi
+  - if [ $TRAVIS_OS_NAME == "osx" ]; then brew update > /dev/null && brew install ccache boost-build boost-python; fi
   - 'if [[ $TRAVIS_OS_NAME == "osx" && $docs = "1" ]]; then
     easy_install --user docutils;
     mkdir -p /Users/travis/Library/Python/2.7/lib/python/site-packages;
     echo ''import site; site.addsitedir("/usr/local/lib/python2.7/site-packages")'' >> /Users/travis/Library/Python/2.7/lib/python/site-packages/homebrew.pth;
     easy_install --user Pygments;
     easy_install --user aafigure;
-    brew install --quiet graphviz hunspell;
+    brew install graphviz hunspell;
     easy_install --user Pillow;
     fi'
 
diff --git a/Jamfile b/Jamfile
index ec712406a..cf1fff234 100644
--- a/Jamfile
+++ b/Jamfile
@@ -30,7 +30,6 @@ else
 {
 	local boost-lib-search-path =
 		<search>/opt/local/lib
-		<search>/usr/lib
 		<search>/usr/local/lib
 		<search>/sw/lib
 		<search>/usr/g++/lib
@@ -547,13 +546,18 @@ lib gcc : : <name>gcc <link>static ;
 # when using iconv
 lib libiconv : : <name>iconv <link>shared <search>/usr/local/lib ;
 
-# openssl on linux/bsd/macos etc.
+# openssl on linux/bsd etc.
 lib gcrypt : : <name>gcrypt <link>shared <search>/opt/local/lib ;
-lib z : : <link>shared <name>z <search>/usr/lib ;
-lib crypto : : <name>crypto <link>shared <search>/usr/lib <use>z : : <include>/opt/local/include ;
-lib ssl : : <name>ssl <link>shared <use>crypto <search>/opt/local/lib : : <include>/opt/local/include ;
+lib z : : <link>shared <name>z ;
 lib dl : : <link>shared <name>dl ;
 
+# pick up openssl on macos from brew
+lib crypto : : <name>crypto <use>z <target-os>darwin <search>/usr/local/opt/openssl/lib : <link>shared : <include>/usr/local/opt/openssl/include ;
+lib ssl : : <name>ssl <use>crypto <target-os>darwin <search>/usr/local/opt/openssl/lib : <link>shared : <include>/usr/local/opt/openssl/include ;
+
+lib crypto : : <name>crypto <use>z : <link>shared ;
+lib ssl : : <name>ssl <use>crypto : <link>shared ;
+
 # time functions used on linux require librt
 lib librt : : <name>rt <link>shared ;