diff --git a/boost-base.jam b/boost-base.jam
index 8fbdbac92..0b8f1bf20 100644
--- a/boost-base.jam
+++ b/boost-base.jam
@@ -1593,7 +1593,7 @@ rule subvariant-target ( target : subvariant-id build-properties * : toolset var
     # transfer target variables to the target file.
     set-target-variables $(target-files) ;
 
-    if [ get-values <LIB> <DLL> : $(gTARGET_DEPS($(target))) ]
+    if [ get-values <LIB> <$(SHARED_TYPES)> : $(gTARGET_DEPS($(target))) ]
     {
         local libs dlls ;
         {
@@ -1610,7 +1610,7 @@ rule subvariant-target ( target : subvariant-id build-properties * : toolset var
             BUILD ?= $(gTARGET_DEFAULT_BUILD($(target))) ;
             libs = [ link-libraries [ get-values <LIB> : $(gTARGET_DEPS($(target))) ]
                     : $(toolset) $(variant) : $(simple-properties) ] ;
-            dlls = [ link-libraries [ get-values <DLL> : $(gTARGET_DEPS($(target))) ]
+            dlls = [ link-libraries [ get-values <$(SHARED_TYPES)> : $(gTARGET_DEPS($(target))) ]
                     : $(toolset) $(variant) : $(simple-properties) ] ;
         }
         depend-on-libraries $(target-files) : $(libs) ;
diff --git a/python.jam b/python.jam
index ff1d07eb6..b577508b3 100644
--- a/python.jam
+++ b/python.jam
@@ -262,6 +262,7 @@ PYDMODE = $(DLLMODE) ;
 SHARED_TYPES += PYD ;
 
 gTARGET_TYPE_ID(pyd) = PYD ;
+gIS_DEPENDENCY(PYD) = TRUE ;
 
 # Declare a python extension.
 rule extension ( name : sources + : requirements * : default-BUILD * )
diff --git a/v1/boost-base.jam b/v1/boost-base.jam
index 8fbdbac92..0b8f1bf20 100644
--- a/v1/boost-base.jam
+++ b/v1/boost-base.jam
@@ -1593,7 +1593,7 @@ rule subvariant-target ( target : subvariant-id build-properties * : toolset var
     # transfer target variables to the target file.
     set-target-variables $(target-files) ;
 
-    if [ get-values <LIB> <DLL> : $(gTARGET_DEPS($(target))) ]
+    if [ get-values <LIB> <$(SHARED_TYPES)> : $(gTARGET_DEPS($(target))) ]
     {
         local libs dlls ;
         {
@@ -1610,7 +1610,7 @@ rule subvariant-target ( target : subvariant-id build-properties * : toolset var
             BUILD ?= $(gTARGET_DEFAULT_BUILD($(target))) ;
             libs = [ link-libraries [ get-values <LIB> : $(gTARGET_DEPS($(target))) ]
                     : $(toolset) $(variant) : $(simple-properties) ] ;
-            dlls = [ link-libraries [ get-values <DLL> : $(gTARGET_DEPS($(target))) ]
+            dlls = [ link-libraries [ get-values <$(SHARED_TYPES)> : $(gTARGET_DEPS($(target))) ]
                     : $(toolset) $(variant) : $(simple-properties) ] ;
         }
         depend-on-libraries $(target-files) : $(libs) ;
diff --git a/v1/python.jam b/v1/python.jam
index ff1d07eb6..b577508b3 100644
--- a/v1/python.jam
+++ b/v1/python.jam
@@ -262,6 +262,7 @@ PYDMODE = $(DLLMODE) ;
 SHARED_TYPES += PYD ;
 
 gTARGET_TYPE_ID(pyd) = PYD ;
+gIS_DEPENDENCY(PYD) = TRUE ;
 
 # Declare a python extension.
 rule extension ( name : sources + : requirements * : default-BUILD * )