diff --git a/CHANGELOG b/CHANGELOG
index 16612cb0ea..9c6afc00d3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+git-annex (6.20180317) UNRELEASED; urgency=medium
+
+  * Fix calculation of estimated completion for progress meter.
+
+ -- Joey Hess <id@joeyh.name>  Mon, 19 Mar 2018 23:13:59 -0400
+
 git-annex (6.20180316) upstream; urgency=medium
 
   * New protocol for communicating with git-annex-shell increases speed
diff --git a/Utility/Metered.hs b/Utility/Metered.hs
index 2eb665d21d..f200502237 100644
--- a/Utility/Metered.hs
+++ b/Utility/Metered.hs
@@ -383,5 +383,5 @@ bandwidthMeter mtotalsize (BytesProcessed old, before) (BytesProcessed new, now)
 		Just totalsize
 			| bytespersecond > 0 -> 
 				Just $ fromDuration $ Duration $
-					totalsize `div` bytespersecond
+					(totalsize - new) `div` bytespersecond
 		_ -> Nothing