diff --git a/dali/dfu/dfuutil.cpp b/dali/dfu/dfuutil.cpp
index 0687dff1a55..8ec3f62b07c 100644
--- a/dali/dfu/dfuutil.cpp
+++ b/dali/dfu/dfuutil.cpp
@@ -421,8 +421,15 @@ class CFileCloner
             // JCSMORE: it may be this can replace the need for the other 'clone*' attributes altogether.
             if (srcfdesc->queryProperties().hasProp("_remoteStoragePlane"))
             {
-                attrs.setPropTree("cloneFromFDesc", createPTreeFromIPT(srcTree));
-                return;
+                if (srcdali && !srcdali->endpoint().isNull())
+                {
+                    attrs.setPropTree("cloneFromFDesc", createPTreeFromIPT(srcTree));
+                    StringBuffer host;
+                    attrs.setProp("@cloneFrom", srcdali->endpoint().getEndpointHostText(host).str());
+                    if (prefix.length())
+                        attrs.setProp("@cloneFromPrefix", prefix.get());
+                    return;
+                }
             }
 
             while(attrs.removeProp("cloneFromGroup"));