diff --git a/src/lib/Hydra/Controller/Build.pm b/src/lib/Hydra/Controller/Build.pm
index 3532d9ef..9efdc7d2 100644
--- a/src/lib/Hydra/Controller/Build.pm
+++ b/src/lib/Hydra/Controller/Build.pm
@@ -54,7 +54,7 @@ sub view_build : Chained('build') PathPart('') Args(0) {
     
     (my $lastBuildStep) = $build->buildsteps->search({},{order_by => "stepnr DESC", rows => 1});
     my $path = defined $lastBuildStep ? $lastBuildStep->logfile : "" ;
-    if (defined $build->resultInfo && $build->resultInfo->buildstatus == 1 && !($path eq "") && -f $lastBuildStep->logfile) {
+    if (defined $build->resultInfo && ($build->resultInfo->buildstatus == 1 || $build->resultInfo->buildstatus == 6) && !($path eq "") && -f $lastBuildStep->logfile) {
 	$c->stash->{logtext} = `tail -n 50 $path`;
     }
 
diff --git a/src/root/build.tt b/src/root/build.tt
index d9a7297c..82920c0b 100644
--- a/src/root/build.tt
+++ b/src/root/build.tt
@@ -180,7 +180,7 @@
 		[% END %]
 
 		[% IF build.finished %]
-			[% IF build.buildsteps && build.resultInfo.buildstatus != 0 %]
+			[% IF build.buildsteps && build.resultInfo.buildstatus != 0 && build.resultInfo.buildstatus != 6 %]
 				[% INCLUDE renderBuildSteps type="Failed" %]
 			[% END %]
 
@@ -190,9 +190,9 @@
             <br/> 
             <table>
                 <thead>
-                    <th>Last successful build</th>
-                    [% IF prevSuccessfulBuild && firstBrokenBuild && firstBrokenBuild.id != build.id %]<th>First broken build</th>[% END %]
-                    <th>This build</th>
+                    <th>Last successful build <tt>[% INCLUDE renderDateTime timestamp = prevSuccessfulBuild.timestamp %]</tt></th>
+                    [% IF prevSuccessfulBuild && firstBrokenBuild && firstBrokenBuild.id != build.id %]<th>First broken build <tt>[% INCLUDE renderDateTime timestamp = firstBrokenBuild.timestamp %]</tt></th>[% END %]
+                    <th>This build <tt>[% INCLUDE renderDateTime timestamp = build.timestamp %]</tt></th>
                 </thead>
                 <tr>
                     <td valign="center">[% INCLUDE renderBuildStatusIcon build=prevSuccessfulBuild size=32 %] [% INCLUDE renderFullBuildLink build=prevSuccessfulBuild %]</td>