diff --git a/lib/Resmon/Status.pm b/lib/Resmon/Status.pm
index 8ed82a6f03412dab960d44ebbdf3fac55e6f5504..3a2d78afeb97bfde9c8e367d36d2fbc18622d01f 100644
--- a/lib/Resmon/Status.pm
+++ b/lib/Resmon/Status.pm
@@ -368,9 +368,11 @@ sub service {
     } elsif($req =~ /^\/([^\/]+)\/(.+)\?plain$/) {
         if($1 eq "System::Time" && $2 eq "now") {
             my $info = {
-              name => 'now',
-	      type => 'i',
-	      value => time(),
+              metric => {
+                name => 'now',
+	        type => 'i',
+	        value => time(),
+              }
             };
             my $response = plain_info($1,$2,$info);
             $client->print(http_header(200, length($response), 'text/plain', $snip));
@@ -388,9 +390,11 @@ sub service {
     } elsif($req =~ /^\/([^\/]+)\/(.+)$/) {
         if($1 eq "System::Time" && $2 eq "now") {
             my $info = {
-              name => 'now',
-	      type => 'i',
-	      value => time(),
+              metric => {
+                name => 'now',
+	        type => 'i',
+	        value => time(),
+              }
             };
             my $response = qq^<?xml version="1.0" encoding="UTF-8"?>\n^;
             $response .= qq^<?xml-stylesheet type="text/xsl" href="/resmon.xsl"?>^;