diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 7af4bf1c92b9c352054f61f1eb386c71239b2641..ab1adb2209414f26028832ad7638243c7d38b4c6 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -2613,7 +2613,8 @@ def _WaitForSync(lu, instance, disks=None, oneshot=False):
       if mstat.sync_percent is not None:
         done = False
         if mstat.estimated_time is not None:
-          rem_time = "%d estimated seconds remaining" % mstat.estimated_time
+          rem_time = ("%s remaining (estimated)" %
+                      utils.FormatSeconds(mstat.estimated_time))
           max_time = mstat.estimated_time
         else:
           rem_time = "no time estimate"
diff --git a/lib/masterd/instance.py b/lib/masterd/instance.py
index 1e13d111cb2e781586c3ba5482ed18c0bb093f36..04806dad65e29f64e505648d43c542faf147b566 100644
--- a/lib/masterd/instance.py
+++ b/lib/masterd/instance.py
@@ -623,7 +623,7 @@ def FormatProgress(progress):
   """Formats progress information for user consumption
 
   """
-  (mbytes, throughput, percent, _) = progress
+  (mbytes, throughput, percent, eta) = progress
 
   parts = [
     utils.FormatUnit(mbytes, "h"),
@@ -635,7 +635,8 @@ def FormatProgress(progress):
   if percent is not None:
     parts.append("%d%%" % percent)
 
-  # TODO: Format ETA
+  if eta is not None:
+    parts.append("ETA %s" % utils.FormatSeconds(eta))
 
   return utils.CommaJoin(parts)