diff --git a/.travis.yml b/.travis.yml
index 353001a63..fc53e840d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,13 +31,14 @@ addons:
     - libboost1.55-tools-dev
     - python2.7-dev
     - g++-5
+    - libc++-dev
 
 before_install:
   - git submodule update --init --recursive
 
 install:
   - 'echo "using gcc : : ccache g++-5 : <cxxflags>-std=c++11 ;" > ~/user-config.jam'
-  - 'echo "using clang : : ccache clang++ : <cxxflags>-std=c++11 ;" >> ~/user-config.jam'
+  - 'echo "using clang : : ccache clang++ : <compileflags>-stdlib=libc++ <linkflags>-stdlib=libc++ <cxxflags>-std=c++11 ;" >> ~/user-config.jam'
   - 'echo "using python : 2.7 ;" >> ~/user-config.jam'
   - ccache -V && ccache --show-stats && ccache --zero-stats
 
diff --git a/Jamfile b/Jamfile
index 9374ace0f..cae426a55 100644
--- a/Jamfile
+++ b/Jamfile
@@ -278,6 +278,8 @@ rule warnings ( properties * )
 		result += <cflags>-Wall ;
 		result += <cflags>-Wextra ;
 
+		result += <cflags>-Wno-deprecated-declarations ;
+
 # enable these warnings again, once the other ones are dealt with
 		result += <cflags>-Wno-sign-compare ;
 	}
diff --git a/simulation/libsimulator b/simulation/libsimulator
index 59a889794..4f3d6916d 160000
--- a/simulation/libsimulator
+++ b/simulation/libsimulator
@@ -1 +1 @@
-Subproject commit 59a889794666ddb64e8cc26cf75834f23afe7e5b
+Subproject commit 4f3d6916d553849e19962f54342a87a7d75c1840