diff --git a/CHANGELOG.md b/CHANGELOG.md
index b30daa0f..05714cc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ Version 91:
 * Set BOOST_ASIO_NO_DEPRECATED
 * Use Asio array optimization in static_buffer_base
 * Rename wstest source file
+* Use fopen_s on Windows
 
 WebSocket:
 
diff --git a/include/boost/beast/config.hpp b/include/boost/beast/config.hpp
index 89f2ec8c..07abf2f9 100644
--- a/include/boost/beast/config.hpp
+++ b/include/boost/beast/config.hpp
@@ -10,9 +10,8 @@
 #ifndef BOOST_BEAST_CONFIG_HPP
 #define BOOST_BEAST_CONFIG_HPP
 
-#include <boost/config.hpp>
-
 // Available to every header
+#include <boost/config.hpp>
 #include <boost/core/ignore_unused.hpp>
 #include <boost/static_assert.hpp>
 
diff --git a/include/boost/beast/core/impl/file_stdio.ipp b/include/boost/beast/core/impl/file_stdio.ipp
index 0a975a88..ca5cb0cb 100644
--- a/include/boost/beast/core/impl/file_stdio.ipp
+++ b/include/boost/beast/core/impl/file_stdio.ipp
@@ -96,12 +96,22 @@ open(char const* path, file_mode mode, error_code& ec)
     case file_mode::append_new:         s = "abx"; break;
     case file_mode::append_existing:    s = "ab"; break;
     }
+#if BOOST_MSVC
+    auto const ev = fopen_s(&f_, path, s);
+    if(ev)
+    {
+        f_ = nullptr;
+        ec.assign(ev, generic_category());
+        return;
+    }
+#else
     f_ = std::fopen(path, s);
     if(! f_)
     {
         ec.assign(errno, generic_category());
         return;
     }
+#endif
     ec.assign(0, ec.category());
 }