diff --git a/src/generator.h b/src/generator.h
index 0951f71..72f7d53 100644
--- a/src/generator.h
+++ b/src/generator.h
@@ -1309,8 +1309,25 @@ void Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::PrintDate
 {
 	bool is_roman = HasParam(parameters, L"roman");
 	bool is_no_sec = HasParam(parameters, L"no_sec");
+	bool only_date = HasParam(parameters, L"only_date");
+	bool only_time = HasParam(parameters, L"only_time");
 
-	date->Serialize(out_stream, is_roman, !is_no_sec);
+	if( only_date )
+	{
+		date->SerializeYearMonthDay(out_stream, is_roman);
+	}
+	else
+	if( only_time )
+	{
+		if( is_no_sec )
+			date->SerializeHourMin(out_stream);
+		else
+			date->SerializeHourMinSec(out_stream);
+	}
+	else
+	{
+		date->Serialize(out_stream, is_roman, !is_no_sec);
+	}
 }