diff --git a/v2/test/library_chain.py b/v2/test/library_chain.py
index e86c49a84..c5ccb0e95 100644
--- a/v2/test/library_chain.py
+++ b/v2/test/library_chain.py
@@ -12,7 +12,12 @@ import string
 
 t = Tester()
 
-t.write("Jamfile", """ 
+t.write("Jamfile", """
+# Stage the binary, so that it will be relinked
+# without hardcode-dll-paths. That will chech that
+# we pass correct -rpath-link, even if not passing
+# -rpath.
+stage dist : main ;
 exe main : main.cpp b ; 
 """)
 
diff --git a/v2/tools/builtin.jam b/v2/tools/builtin.jam
index edfdeae2c..89e288ed1 100644
--- a/v2/tools/builtin.jam
+++ b/v2/tools/builtin.jam
@@ -693,6 +693,7 @@ class linking-generator : generator
     rule run ( project name ? : property-set : sources + :  multiple ? )
     {   
         if [ $(property-set).get <hardcode-dll-paths> ] = true
+         && [ type.is-derived $(self.target-types[1]) EXE ] 
         {
             local xdll-path = [ $(property-set).get <xdll-path> ] ;
             # It's possible that we have libraries in sources which did not came