diff --git a/utils/deploy_tool/main.cpp b/utils/deploy_tool/main.cpp
index 15ee0197..32915256 100644
--- a/utils/deploy_tool/main.cpp
+++ b/utils/deploy_tool/main.cpp
@@ -385,7 +385,6 @@ void patchNameTool() {
 	patch_list = input_files;
 	patch_list << plugin_libs;
 	piForeach (PIString l, clibs) {
-		piCout << "ALL:" << l;
 		fi.path = l;
 		patch_list << (out_dir + fi.name());
 	}
@@ -410,7 +409,7 @@ void patchNameTool() {
 			PIString fl = findLib(libname), fname = frameworkName(sys_lib);
 			piCout << "  check" << sys_lib << fl;
 			PIString new_path;
-			if (all_libs.contains(fl)) {
+			if (all_libs.contains(fl) || all_libs.contains(libname)) {
 				new_path = "@executable_path/../Frameworks/" + libname;
 				piCout << "  depend on lib" << fl;
 			}
@@ -420,7 +419,7 @@ void patchNameTool() {
 				new_path = "@executable_path/../Frameworks/" + fname + "/" + frameworkInternalPath(sys_lib);
 				piCout << "  depend on framework" << fl;
 			}
-			if (!new_path.isEmpty()) {
+			if (!new_path.isEmpty() && (sys_lib != new_path)) {
 				cmd = nametool + " -change \"" + sys_lib + "\"";
 				cmd += " \"" + new_path + "\"";
 				cmd += " \"" + local_lib + "\" 2> /dev/null";