diff --git a/src/lib/Hydra/Controller/Build.pm b/src/lib/Hydra/Controller/Build.pm
index f00eecf8..a833ae04 100644
--- a/src/lib/Hydra/Controller/Build.pm
+++ b/src/lib/Hydra/Controller/Build.pm
@@ -140,9 +140,8 @@ sub view_log : Chained('buildChain') PathPart('log') {
 sub view_runcommand_log : Chained('buildChain') PathPart('runcommand-log') {
     my ($self, $c, $sha) = @_;
 
-    $c->stash->{is_runcommand} = 1;
     $c->stash->{log_uri} = $c->uri_for($c->controller('Root')->action_for("runcommandlog"), $sha . "-" . $c->stash->{build}->id);
-    $c->stash->{template} = 'log.tt';
+    $c->stash->{template} = 'runcommand-log.tt';
 }
 
 
diff --git a/src/root/log.tt b/src/root/log.tt
index 4874fa77..8bb4954d 100644
--- a/src/root/log.tt
+++ b/src/root/log.tt
@@ -1,6 +1,6 @@
 [% WRAPPER layout.tt
-  titleHTML=(is_runcommand ? "RunCommand log of " : "Log of ") _ (step ? " step $step.stepnr of " : "") _ "build ${build.id} of job " _ linkToJob(build.jobset, job)
-  title=(is_runcommand ? "RunCommand log of " : "Log of ") _ (step ? " step $step.stepnr of " : "") _ "build ${build.id} of job " _ makeNameTextForJob(build.jobset, job)
+  titleHTML="Log of " _ (step ? " step $step.stepnr of " : "") _ "build ${build.id} of job " _ linkToJob(build.jobset, job)
+  title="Log of " _ (step ? " step $step.stepnr of " : "") _ "build ${build.id} of job " _ makeNameTextForJob(build.jobset, job)
 %]
 [% PROCESS common.tt %]
 
@@ -11,7 +11,7 @@
   [% ELSE %]
   is
   [% END %]
-  [% IF is_runcommand %] the output of a RunCommand execution of[% ELSE %] the build log of[% END %] derivation <tt>[% IF step; step.drvpath; ELSE; build.drvpath; END %]</tt>.
+  the build log of derivation <tt>[% IF step; step.drvpath; ELSE; build.drvpath; END %]</tt>.
   [% IF step && step.machine %]
     It was built on <tt>[% step.machine %]</tt>.
   [% END %]
diff --git a/src/root/runcommand-log.tt b/src/root/runcommand-log.tt
new file mode 100644
index 00000000..d1d4cd75
--- /dev/null
+++ b/src/root/runcommand-log.tt
@@ -0,0 +1,49 @@
+[% WRAPPER layout.tt
+  titleHTML="RunCommand log of " _ (step ? " step $step.stepnr of " : "") _ "build ${build.id} of job " _ linkToJob(build.jobset, job)
+  title="RunCommand log of " _ (step ? " step $step.stepnr of " : "") _ "build ${build.id} of job " _ makeNameTextForJob(build.jobset, job)
+%]
+[% PROCESS common.tt %]
+
+<p>
+  Below
+  [% IF tail %]
+  are the last lines of
+  [% ELSE %]
+  is
+  [% END %]
+  the output of a RunCommand execution of derivation <tt>[% IF step; step.drvpath; ELSE; build.drvpath; END %]</tt>.
+  [% 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.
+  [% END %]
+</p>
+
+<div class="card bg-light"><div class="card-body"><pre class="log" id="contents">
+<em>Loading...</em>
+</pre></div></div>
+
+<script type="text/javascript">
+  $(document).ready(function() {
+    requestPlainFile({
+      url: "[% HTML.escape(log_uri) %]",
+      dataType: "text",
+      type: 'GET',
+      success: function (log_data) {
+
+        [% IF tail %]
+        /* The server may give us a full log (e.g. if the log is in
+           S3). So extract the last lines. */
+        log_data = log_data.split("\n").slice(-[%tail%]).join("\n");
+        [% END %]
+
+        $("#contents").text(log_data);
+      },
+      error: function () {
+        bootbox.alert("The RunCommand log file is not available.");
+        $("#contents").text("(Unavailable)");
+      }
+    });
+  });
+</script>
+
+[% END %]