diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html
index 2e430538..b2591943 100644
--- a/rowers/templates/list_workouts.html
+++ b/rowers/templates/list_workouts.html
@@ -179,9 +179,11 @@
             {{ workout.date|date:"Y-m-d" }} {{ workout.starttime|date:"H:i" }}
           </div>
           <div>
-            {{ workout.distance }}m
+            <span style="color:#555">Distance</span><br>
+            {{ workout.distance|distanceprint }}
           </div>
           <div>
+            <span style="color:#555">Time</span><br>
             {{ workout.duration |durationprint:"%H:%M:%S.%f" }}
           </div>
           <div>
diff --git a/rowers/templatetags/rowerfilters.py b/rowers/templatetags/rowerfilters.py
index d51f18ac..05f6edde 100644
--- a/rowers/templatetags/rowerfilters.py
+++ b/rowers/templatetags/rowerfilters.py
@@ -375,6 +375,14 @@ def ddays(ddelta):
 def spacetohtml(t):
     return t.replace(" ","%20")
 
+@register.filter
+def distanceprint(d):
+    if d<10000:
+        return "{d} m".format(d=d)
+
+    d2 = d/1000.
+    return "%.2f km" % d2
+
 @register.filter
 def durationprint(d,dstring):
     if (d == None): # pragma: no cover