diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c959193..e6fba62a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ Version 104:
 * Remove unused include
 * Use #error in config.hpp
 * Only set -std=c++11 on Travis
+* Only set /permissive- on Appveyor
 
 --------------------------------------------------------------------------------
 
diff --git a/Jamfile b/Jamfile
index 7f87e59d..51c45bf1 100644
--- a/Jamfile
+++ b/Jamfile
@@ -101,7 +101,7 @@ project /boost/beast
     <define>BOOST_ASIO_NO_DEPRECATED=1
     <toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS=1
     <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS=1
-    <toolset>msvc:<cxxflags>"/permissive- /bigobj"
+    <toolset>msvc:<cxxflags>"/bigobj"
     <toolset>msvc:<variant>release:<cxxflags>"/Ob2 /Oi /Ot"
     <os>SOLARIS:<library>socket
     <os>SOLARIS:<library>nsl
diff --git a/appveyor.yml b/appveyor.yml
index 355b7b56..33be9772 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -90,5 +90,5 @@ install:
 build: off
 
 test_script:
-  - b2 libs/beast/example toolset=msvc-14.0
-  - b2 libs/beast/test toolset=msvc-14.0
+  - b2 libs/beast/example toolset=msvc-14.0 cxxflags=/permissive-
+  - b2 libs/beast/test toolset=msvc-14.0 cxxflags=/permissive-