diff --git a/src/root/build.tt b/src/root/build.tt
index 2610e939..20ecb04e 100644
--- a/src/root/build.tt
+++ b/src/root/build.tt
@@ -41,13 +41,11 @@
                 <td>[% step.machine.split('@').1 %]</td>
                         <td>
                           [% IF step.busy == 1 %]
-                            [% IF build.finished %]
-                              <span class="error">Aborted</span>
-                            [% ELSE %]
-                              <strong>Building</strong>
-                            [% END %]
+                            <strong>Building</strong>
                           [% ELSIF step.status == 0 %]
                             Succeeded
+                          [% ELSIF step.status == 4 %]
+                            <span class="error">Aborted</span>
                           [% ELSE %]
                             <span class="error">Failed: [% HTML.escape(step.errormsg) %]</span>
                           [% END %]
@@ -163,7 +161,7 @@
 
                 [% END %]
 
-        [% IF !build.finished %]
+        [% IF build.busy %]
             <h3>Running build steps</h3>
             [% INCLUDE renderBuildSteps type="Running" %]
         [% END %]
diff --git a/src/script/hydra-build b/src/script/hydra-build
index 4e6721cc..ebcbb9df 100755
--- a/src/script/hydra-build
+++ b/src/script/hydra-build
@@ -286,10 +286,7 @@ sub doBuild {
                 my $drvPathStep = $1;
                 txn_do($db, sub {
                     my $step = $build->buildsteps->find({stepnr => $buildSteps{$drvPathStep}}) or die;
-                    my $stepOutpath = $step->outpath;
-                    my $stepStatus = 0;
-
-                    $step->update({busy => 0, status => $stepStatus, stoptime => time});
+                    $step->update({busy => 0, status => 0, stoptime => time});
                 });
             }
 
diff --git a/src/script/hydra-queue-runner b/src/script/hydra-queue-runner
index 06f02536..dbf0987f 100755
--- a/src/script/hydra-queue-runner
+++ b/src/script/hydra-queue-runner
@@ -41,6 +41,7 @@ sub unlockDeadBuilds {
             if ($unlock) {
                 print "build ", $build->id, " pid $pid died, unlocking\n";
                 $build->update({ busy => 0, locker => ""});
+                $build->buildsteps->search({ busy => 1 })->update({ busy => 0, status => 4, stoptime => time });
             }
         }
     });