diff --git a/source/java/org/alfresco/repo/deploy/DeploymentServiceImpl.java b/source/java/org/alfresco/repo/deploy/DeploymentServiceImpl.java
index f680e56e48..49e7e2a5e3 100644
--- a/source/java/org/alfresco/repo/deploy/DeploymentServiceImpl.java
+++ b/source/java/org/alfresco/repo/deploy/DeploymentServiceImpl.java
@@ -1055,7 +1055,7 @@ public class DeploymentServiceImpl implements DeploymentService
     	/**
     	 * Lock cluster for the remote target
     	 */
-		String lockStr = hostName + "." + target;
+		String lockStr = hostName + "." + port + "." + target;
 		QName lockQName = QName.createQName("{org.alfresco.deployment.lock}" + lockStr);
 		final Lock lock = new Lock(lockQName);
 		lock.makeLock();