diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index 0c85682..7b549ee 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -15,11 +15,13 @@ import toolset ;
 import architecture ;
 
 project boost/context
-    : source-location ../src
     : requirements
       <os>SOLARIS:<define>_XOPEN_SOURCE=600
+      <link>shared:<define>BOOST_CONTEXT_DYN_LINK=1
+      <define>BOOST_CONTEXT_SOURCE
     : usage-requirements
       <link>shared:<define>BOOST_CONTEXT_DYN_LINK=1
+    : source-location ../src
     ;
 
 local rule default_binary_format ( )
@@ -459,7 +461,6 @@ alias select_asm_context_sources
 
 lib boost_context
    : select_asm_context_sources
-   : <link>shared:<define>BOOST_CONTEXT_DYN_LINK=1
    ;
 
 boost-install boost_context ;
diff --git a/example/Jamfile.v2 b/example/Jamfile.v2
index bad2538..7efcd6c 100644
--- a/example/Jamfile.v2
+++ b/example/Jamfile.v2
@@ -32,7 +32,6 @@ else if [ os.name ] = HPUX
 project boost/context/example
     : requirements
       <library>/boost/context//boost_context
-      <define>BOOST_ALL_NO_LIB=1
       <link>static
     ;
 
diff --git a/include/boost/context/detail/config.hpp b/include/boost/context/detail/config.hpp
index 0d7b7fc..3f59ed0 100644
--- a/include/boost/context/detail/config.hpp
+++ b/include/boost/context/detail/config.hpp
@@ -14,16 +14,12 @@
 # undef BOOST_CONTEXT_DECL
 #endif
 
-#if defined(BOOST_HAS_DECLSPEC)
-# if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_CONTEXT_DYN_LINK)
-#  if ! defined(BOOST_DYN_LINK)
-#   define BOOST_DYN_LINK
-#  endif
-#  if defined(BOOST_CONTEXT_SOURCE)
-#   define BOOST_CONTEXT_DECL BOOST_SYMBOL_EXPORT
-#  else 
-#   define BOOST_CONTEXT_DECL BOOST_SYMBOL_IMPORT
-#  endif
+#if (defined(BOOST_ALL_DYN_LINK) || defined(BOOST_CONTEXT_DYN_LINK) ) && ! defined(BOOST_CONTEXT_STATIC_LINK)
+# if defined(BOOST_CONTEXT_SOURCE)
+#  define BOOST_CONTEXT_DECL BOOST_SYMBOL_EXPORT
+#  define BOOST_CONTEXT_BUILD_DLL
+# else
+#  define BOOST_CONTEXT_DECL BOOST_SYMBOL_IMPORT
 # endif
 #endif