diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8152ecaa..20b726d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 1.0.0-b18
 
+* Increase optimization settings for MSVC builds
+
 HTTP
 
 * Check invariants in parse_op:
@@ -11,6 +13,7 @@ Extras
   - New overload of fail() specifies file and line
   - BEAST_EXPECTS only evaluates the reason string on a failure
 
+
 --------------------------------------------------------------------------------
 
 1.0.0-b17
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27ed6c1e..cc9abdc8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,14 @@ set_property (GLOBAL PROPERTY USE_FOLDERS ON)
 
 if (MSVC)
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /W4 /wd4100 /bigobj /D _WIN32_WINNT=0x0601 /D_SCL_SECURE_NO_WARNINGS=1 /D_CRT_SECURE_NO_WARNINGS=1")
+    set (CMAKE_CXX_FLAGS_DEBUG                 "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
+    set (CMAKE_CXX_FLAGS_RELEASE               "${CMAKE_CXX_FLAGS_RELEASE} /Ob2 /Oi /Ot /GL /MT")
+    set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Ob2 /Oi /Ot /GL /MT")
+
     set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
+    set (CMAKE_EXE_LINKER_FLAGS_RELEASE               "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG")
+    set (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /LTCG")
+
 else()
     set(Boost_USE_STATIC_LIBS ON)
     set(Boost_USE_MULTITHREADED ON)
diff --git a/Jamroot b/Jamroot
index fca729e8..7bff11f9 100644
--- a/Jamroot
+++ b/Jamroot
@@ -97,7 +97,8 @@ project beast
     <toolset>clang:<cxxflags>-std=c++11
     <toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS=1
     <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS=1
-    <toolset>msvc:<cxxflags>-bigobj
+    <toolset>msvc:<cxxflags>"/wd4100 /bigobj"
+    <toolset>msvc,<variant>release:<cxxflags>"/Ob2 /Oi /Ot"
     <os>LINUX:<define>_XOPEN_SOURCE=600
     <os>LINUX:<define>_GNU_SOURCE=1
     <os>SOLARIS:<define>_XOPEN_SOURCE=500