diff --git a/lib/WebGUI/Macro/D_date.pm b/lib/WebGUI/Macro/D_date.pm
index 3dc5bacfe..05bf2278d 100644
--- a/lib/WebGUI/Macro/D_date.pm
+++ b/lib/WebGUI/Macro/D_date.pm
@@ -16,9 +16,10 @@ use WebGUI::Macro;
 
 #-------------------------------------------------------------------
 sub _replacement {
-        my (@param, $temp);
+        my (@param, $temp, $time);
         @param = WebGUI::Macro::getParams($_[0]);
-	$temp = epochToHuman(time(),$param[0]);
+	$time = $param[1] || time();
+	$temp = epochToHuman($time,$param[0]);
 	return $temp;
 }