Index: django/template/defaultfilters.py
===================================================================
--- django/template/defaultfilters.py	(revision 3008)
+++ django/template/defaultfilters.py	(working copy)
@@ -341,11 +341,23 @@
         arg = settings.TIME_FORMAT
     return time_format(value, arg)
 
-def timesince(value):
+def timesince(value, arg=None):
     'Formats a date as the time since that date (i.e. "4 days, 6 hours")'
     from django.utils.timesince import timesince
-    return timesince(value)
+    if arg:
+        return timesince(arg, value)
+    else:
+        return timesince(value)
 
+def timeuntil(value, arg=None):
+    'Formats a date as the time until that date (i.e. "4 days, 6 hours")'
+    from django.utils.timesince import timeuntil
+    if arg:
+        return timeuntil(arg, value)
+    else:
+        return timeuntil(value)
+
+
 ###################
 # LOGIC           #
 ###################