diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5abb333..3f7feb53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,6 +39,11 @@ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/gtest/CMakeLists.txt)
 endif ()
 
 if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/tinyformat/tinyformat_test.cpp)
+  find_package(Boost)
+  if (Boost_FOUND)
+    add_definitions(-DHAVE_BOOST)
+  endif ()
+
   add_executable(tinyformat_speed_test tinyformat/tinyformat_test.cpp)
   target_link_libraries(tinyformat_speed_test format)
   set_target_properties(tinyformat_speed_test
diff --git a/tinyformat b/tinyformat
index 2e4ba49f..01001483 160000
--- a/tinyformat
+++ b/tinyformat
@@ -1 +1 @@
-Subproject commit 2e4ba49f4f253de1dc1e30ca9b7a488bc8cbe0b2
+Subproject commit 01001483d6804949c377f3793a9c814b57142c17