diff --git a/src/lib/Hydra/Controller/Build.pm b/src/lib/Hydra/Controller/Build.pm
index 1b2be1eb..af648109 100644
--- a/src/lib/Hydra/Controller/Build.pm
+++ b/src/lib/Hydra/Controller/Build.pm
@@ -142,10 +142,12 @@ sub view_log : Chained('buildChain') PathPart('log') {
 
 
 sub view_runcommandlog : Chained('buildChain') PathPart('runcommandlog') {
-    my ($self, $c, $uuid) = @_;
+    my ($self, $c, $uuid, $mode) = @_;
 
-    $c->stash->{log_uri} = $c->uri_for($c->controller('Root')->action_for("runcommandlog"), $uuid);
+    my $log_uri = $c->uri_for($c->controller('Root')->action_for("runcommandlog"), $uuid);
+    showLog($c, $mode, $log_uri);
     $c->stash->{template} = 'runcommand-log.tt';
+    $c->stash->{runcommandlog} = $c->stash->{build}->runcommandlogs->find({ uuid => $uuid });
 }
 
 
diff --git a/src/root/runcommand-log.tt b/src/root/runcommand-log.tt
index d1d4cd75..7d346823 100644
--- a/src/root/runcommand-log.tt
+++ b/src/root/runcommand-log.tt
@@ -11,10 +11,10 @@
   [% ELSE %]
   is
   [% END %]
-  the output of a RunCommand execution of derivation <tt>[% IF step; step.drvpath; ELSE; build.drvpath; END %]</tt>.
+  the output of a RunCommand execution of the command <tt>[% runcommandlog.command %]</tt>
+  on <a href="[% c.uri_for('/build', build.id) %]">Build [% build.id %]</a>.
   [% IF tail %]
-  The <a href="[% step ? c.uri_for('/build' build.id 'nixlog' step.stepnr)
-  : c.uri_for('/build' build.id 'log') %]">full log</a> is also available.
+  The <a href="[% c.uri_for('/build', build.id, 'runcommandlog', runcommandlog.uuid) %]">full log</a> is also available.
   [% END %]
 </p>