diff --git a/TOOLS/dylib-unhell.py b/TOOLS/dylib-unhell.py
index b96e28d28c..c41d20083b 100755
--- a/TOOLS/dylib-unhell.py
+++ b/TOOLS/dylib-unhell.py
@@ -23,10 +23,35 @@ def is_user_lib(objfile, libname):
            not os.path.basename(objfile) in libname and \
            not "libswift" in libname
 
-def otool(objfile):
+def otool(objfile, rapths):
     command = "otool -L '%s' | grep -e '\t' | awk '{ print $1 }'" % objfile
     output  = subprocess.check_output(command, shell = True, universal_newlines=True)
-    return set(filter(partial(is_user_lib, objfile), output.split()))
+    libs = set(filter(partial(is_user_lib, objfile), output.split()))
+
+    libs_resolved = set()
+    libs_relative = set()
+    for lib in libs:
+        lib_path = resolve_lib_path(objfile, lib, rapths)
+        libs_resolved.add(lib_path)
+        if lib_path != lib:
+            libs_relative.add(lib)
+
+    return libs_resolved, libs_relative
+
+def get_rapths(objfile):
+    rpaths = []
+    command = "otool -l '%s' | grep -A2 LC_RPATH | grep path" % objfile
+    pathRe = re.compile("^\s*path (.*) \(offset \d*\)$")
+
+    try:
+        result = subprocess.check_output(command, shell = True, universal_newlines=True)
+    except:
+        return rpaths
+
+    for line in result.splitlines():
+        rpaths.append(pathRe.search(line).group(1).strip())
+
+    return rpaths
 
 def get_rpaths_dev_tools(binary):
     command = "otool -l '%s' | grep -A2 LC_RPATH | grep path | grep \"Xcode\|CommandLineTools\"" % binary
@@ -39,11 +64,29 @@ def get_rpaths_dev_tools(binary):
 
     return output
 
+def resolve_lib_path(objfile, lib, rapths):
+    if os.path.exists(lib):
+        return lib
+
+    if lib.startswith('@rpath/'):
+        lib = lib[len('@rpath/'):]
+        for rpath in rapths:
+            lib_path = os.path.join(rpath, lib)
+            if os.path.exists(lib_path):
+                return lib_path
+    elif lib.startswith('@loader_path/'):
+        lib = lib[len('@loader_path/'):]
+        lib_path = os.path.normpath(os.path.join(objfile, lib))
+        if os.path.exists(lib_path):
+            return lib_path
+
+    raise Exception('Could not resolve library: ' + lib)
+
 def install_name_tool_change(old, new, objfile):
-    subprocess.call(["install_name_tool", "-change", old, new, objfile])
+    subprocess.call(["install_name_tool", "-change", old, new, objfile], stderr=subprocess.DEVNULL)
 
 def install_name_tool_id(name, objfile):
-    subprocess.call(["install_name_tool", "-id", name, objfile])
+    subprocess.call(["install_name_tool", "-id", name, objfile], stderr=subprocess.DEVNULL)
 
 def install_name_tool_add_rpath(rpath, binary):
     subprocess.call(["install_name_tool", "-add_rpath", rpath, binary])
@@ -51,15 +94,17 @@ def install_name_tool_add_rpath(rpath, binary):
 def install_name_tool_delete_rpath(rpath, binary):
     subprocess.call(["install_name_tool", "-delete_rpath", rpath, binary])
 
-def libraries(objfile, result = dict()):
-    libs_list       = otool(objfile)
+def libraries(objfile, result = dict(), result_relative = set(), rapths = []):
+    rapths = get_rapths(objfile) + rapths
+    libs_list, libs_relative = otool(objfile, rapths)
     result[objfile] = libs_list
+    result_relative |= libs_relative
 
     for lib in libs_list:
         if lib not in result:
-            libraries(lib, result)
+            libraries(lib, result, result_relative, rapths)
 
-    return result
+    return result, result_relative
 
 def lib_path(binary):
     return os.path.join(os.path.dirname(binary), 'lib')
@@ -67,7 +112,7 @@ def lib_path(binary):
 def lib_name(lib):
     return os.path.join("@executable_path", "lib", os.path.basename(lib))
 
-def process_libraries(libs_dict, binary):
+def process_libraries(libs_dict, libs_dyn, binary):
     libs_set = set(libs_dict)
     # Remove binary from libs_set to prevent a duplicate of the binary being
     # added to the libs directory.
@@ -75,7 +120,7 @@ def process_libraries(libs_dict, binary):
 
     for src in libs_set:
         name = lib_name(src)
-        dst  = os.path.join(lib_path(binary), os.path.basename(src))
+        dst = os.path.join(lib_path(binary), os.path.basename(src))
 
         shutil.copy(src, dst)
         os.chmod(dst, 0o755)
@@ -88,6 +133,12 @@ def process_libraries(libs_dict, binary):
             if p in libs_dict[src]:
                 install_name_tool_change(p, lib_name(p), dst)
 
+        for lib in libs_dyn:
+            install_name_tool_change(lib, lib_name(lib), dst)
+
+    for lib in libs_dyn:
+        install_name_tool_change(lib, lib_name(lib), binary)
+
 def process_swift_libraries(binary):
     command = ['xcrun', '--find', 'swift-stdlib-tool']
     swiftStdlibTool = subprocess.check_output(command, universal_newlines=True).strip()
@@ -115,10 +166,10 @@ def main():
     if not os.path.exists(lib_path(binary)):
         os.makedirs(lib_path(binary))
     print(">> gathering all linked libraries")
-    libs = libraries(binary)
+    libs, libs_rel = libraries(binary)
 
     print(">> copying and processing all linked libraries")
-    process_libraries(libs, binary)
+    process_libraries(libs, libs_rel, binary)
 
     print(">> removing rpath definitions towards dev tools")
     remove_dev_tools_rapths(binary)