diff --git a/gcc-tools.jam b/gcc-tools.jam
index 8cf88866d..532c5934a 100644
--- a/gcc-tools.jam
+++ b/gcc-tools.jam
@@ -52,11 +52,11 @@ if ! $(NT) # The compiler complains about -fPIC on NT
 
 if $(BETOOLS)
 {
-    flags gcc LINKFLAGS <target-type>DLL <target-type>PYD : -nostart ;
+    flags gcc LINKFLAGS <target-type>$(SHARED_TYPES) : -nostart ;
 }
 else
 {
-    flags gcc LINKFLAGS <target-type>DLL <target-type>PYD : -shared ;
+    flags gcc LINKFLAGS <target-type>$(SHARED_TYPES) : -shared ;
 }
 
 flags gcc LIBPATH <library-path> ;
diff --git a/python.jam b/python.jam
index eb80b4738..8f5037a0f 100644
--- a/python.jam
+++ b/python.jam
@@ -60,6 +60,7 @@ else if $(UNIX)
       <include>$(PYTHON_ROOT)/include/python$(PYTHON_VERSION)
         <library-path>$(PYTHON_ROOT)/lib/python$(PYTHON_VERSION)/config 
           <find-library>python$(PYTHON_VERSION)
+            <cxx><*><cflags>"-expect_unresolved 'Py*' -expect_unresolved '_Py*'"
       ;
 }
 
diff --git a/v1/gcc-tools.jam b/v1/gcc-tools.jam
index 8cf88866d..532c5934a 100644
--- a/v1/gcc-tools.jam
+++ b/v1/gcc-tools.jam
@@ -52,11 +52,11 @@ if ! $(NT) # The compiler complains about -fPIC on NT
 
 if $(BETOOLS)
 {
-    flags gcc LINKFLAGS <target-type>DLL <target-type>PYD : -nostart ;
+    flags gcc LINKFLAGS <target-type>$(SHARED_TYPES) : -nostart ;
 }
 else
 {
-    flags gcc LINKFLAGS <target-type>DLL <target-type>PYD : -shared ;
+    flags gcc LINKFLAGS <target-type>$(SHARED_TYPES) : -shared ;
 }
 
 flags gcc LIBPATH <library-path> ;
diff --git a/v1/python.jam b/v1/python.jam
index eb80b4738..8f5037a0f 100644
--- a/v1/python.jam
+++ b/v1/python.jam
@@ -60,6 +60,7 @@ else if $(UNIX)
       <include>$(PYTHON_ROOT)/include/python$(PYTHON_VERSION)
         <library-path>$(PYTHON_ROOT)/lib/python$(PYTHON_VERSION)/config 
           <find-library>python$(PYTHON_VERSION)
+            <cxx><*><cflags>"-expect_unresolved 'Py*' -expect_unresolved '_Py*'"
       ;
 }