diff --git a/Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj b/Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj
index 2c773805a..0df23244e 100644
--- a/Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj
+++ b/Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj
@@ -86,6 +86,7 @@
     <ClInclude Include="..\..\modules\beast_asio\sockets\beast_SslContext.h" />
     <ClInclude Include="..\..\modules\beast_asio\streams\beast_PrefilledReadStream.h" />
     <ClInclude Include="..\..\modules\beast_asio\system\beast_BoostIncludes.h" />
+    <ClInclude Include="..\..\modules\beast_asio\system\beast_OpenSSLIncludes.h" />
     <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeer.h" />
     <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerBasics.h" />
     <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerDetails.h" />
diff --git a/Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj.filters b/Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj.filters
index 601d42096..440982c12 100644
--- a/Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj.filters
+++ b/Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj.filters
@@ -845,15 +845,18 @@
     <ClInclude Include="..\..\modules\beast_asio\handshake\beast_HandshakeDetectLogicPROXY.h">
       <Filter>beast_asio\handshake</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\handshake\beast_InputParser.h">
-      <Filter>beast_asio\handshake</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\beast_asio\basics\beast_HandlerCall.h">
       <Filter>beast_asio\basics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\modules\beast_core\memory\beast_ContainerDeletePolicy.h">
       <Filter>beast_core\memory</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\handshake\beast_InputParser.h">
+      <Filter>beast_asio\sockets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_asio\system\beast_OpenSSLIncludes.h">
+      <Filter>beast_asio\system</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\modules\beast_core\beast_core.cpp">
diff --git a/Subtrees/beast/modules/beast_asio/beast_asio.cpp b/Subtrees/beast/modules/beast_asio/beast_asio.cpp
index ef34ceb84..a4b780995 100644
--- a/Subtrees/beast/modules/beast_asio/beast_asio.cpp
+++ b/Subtrees/beast/modules/beast_asio/beast_asio.cpp
@@ -19,6 +19,8 @@
 
 #include "BeastConfig.h"
 
+#include "system/beast_OpenSSLIncludes.h"
+
 #include "beast_asio.h"
 
 namespace beast
diff --git a/Subtrees/beast/modules/beast_asio/system/beast_OpenSSLIncludes.h b/Subtrees/beast/modules/beast_asio/system/beast_OpenSSLIncludes.h
new file mode 100644
index 000000000..92133891c
--- /dev/null
+++ b/Subtrees/beast/modules/beast_asio/system/beast_OpenSSLIncludes.h
@@ -0,0 +1,40 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_OPENSSLINCLUDES_H_INCLUDED
+#define BEAST_OPENSSLINCLUDES_H_INCLUDED
+
+#define OPENSSL_THREAD_DEFINES
+#include <openssl/opensslconf.h>
+
+//------------------------------------------------------------------------------
+
+// Configure our settings based on what we find
+//
+#if defined(OPENSSL_THREADS)
+# ifndef BEAST_OPENSSL_MULTITHREADED
+#   define BEAST_OPENSSL_MULTITHREADED 1
+# endif
+#else
+# ifndef BEAST_OPENSSL_MULTITHREADED
+#  define BEAST_OPENSSL_MULTITHREADED 0
+# endif
+#endif
+
+#endif