diff --git a/src/lib/Hydra/Controller/Build.pm b/src/lib/Hydra/Controller/Build.pm
index 504c2b66..a16cea9e 100644
--- a/src/lib/Hydra/Controller/Build.pm
+++ b/src/lib/Hydra/Controller/Build.pm
@@ -306,6 +306,39 @@ sub contents : Chained('build') PathPart Args(1) {
 }
 
 
+sub getDependencyGraph {
+    my ($self, $c, $runtime, $done, $path) = @_;
+    my $node = $$done{$path};
+
+    if (!defined $node) {
+        $path =~ /\/[a-z0-9]+-(.*)$/;
+        my $name = $1 // $path;
+        $name =~ s/\.drv$//;
+        $node =
+            { path => $path
+            , name => $name
+            , buildStep => $runtime
+                ? findBuildStepByOutPath($self, $c, $path, 0)
+                : findBuildStepByDrvPath($self, $c, $path, 0)
+            };
+        $$done{$path} = $node;
+        my @refs;
+        foreach my $ref (queryReferences($path)) {
+            next if $ref eq $path;
+            next unless $runtime || $ref =~ /\.drv$/;
+            getDependencyGraph($self, $c, $runtime, $done, $ref);
+            push @refs, $ref;
+        }
+        # Show in reverse topological order to flatten the graph.
+        # Should probably do a proper BFS.
+        my @sorted = reverse topoSortPaths(@refs);
+        $node->{refs} = [map { $$done{$_} } @sorted];
+    }
+
+    return $node;
+}
+
+
 sub deps : Chained('build') PathPart('deps') {
     my ($self, $c) = @_;
 
@@ -316,28 +349,16 @@ sub deps : Chained('build') PathPart('deps') {
     $c->stash->{available} = all { isValidPath($_) } @outPaths;
     $c->stash->{drvAvailable} = isValidPath $drvPath;
 
-    my @buildtimepaths = $c->stash->{drvAvailable} ? computeFSClosure(0, 0, $drvPath) : ();
-    my @buildtimedeps = ();
-
-    my @runtimepaths = $c->stash->{available} ? computeFSClosure(0, 0, @outPaths) : ();
-    my @runtimedeps = ();
-
-    foreach my $p (@buildtimepaths) {
-        next unless $p =~ /\.drv$/;
-        my ($buildStep) = findBuildStepByDrvPath($self, $c, $p, 0);
-        my %dep = ( buildstep => $buildStep, path => $p );
-        push(@buildtimedeps, \%dep);
+    if ($c->stash->{available}) {
+        my $done = {};
+        $c->stash->{runtimeGraph} = [ map { getDependencyGraph($self, $c, 1, $done, $_) } @outPaths ];
     }
 
-    foreach my $p (@runtimepaths) {
-        my ($buildStep) = findBuildStepByOutPath($self, $c, $p, 0);
-        my %dep = ( buildstep => $buildStep, path => $p );
-        push(@runtimedeps, \%dep);
+    if ($c->stash->{drvAvailable}) {
+        my $done = {};
+        $c->stash->{buildTimeGraph} = getDependencyGraph($self, $c, 0, $done, $drvPath);
     }
 
-    $c->stash->{buildtimedeps} = \@buildtimedeps;
-    $c->stash->{runtimedeps} = \@runtimedeps;
-
     $c->stash->{template} = 'deps.tt';
 }
 
diff --git a/src/root/build.tt b/src/root/build.tt
index ecd3c90c..3f1ae08d 100644
--- a/src/root/build.tt
+++ b/src/root/build.tt
@@ -53,9 +53,7 @@
                 [% ELSE %]
                   <span class="error">Failed: [% HTML.escape(step.errormsg) %]</span>
                 [% END %]
-                [% IF has_log %]
-                  (<a href="[% log %]">log</a>, <a href="[% "$log/raw" %]">raw</a>, <a href="[% "$log/tail-reload" %]">tail</a>)
-                [% END %]
+                [%%] [%+ IF has_log; INCLUDE renderLogLinks url=log; END %]
               </td>
             </tr>
           [% END %]
diff --git a/src/root/common.tt b/src/root/common.tt
index 0f17aeb4..65a6c016 100644
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -475,3 +475,8 @@
   </tbody>
 </table>
 [% END %]
+
+
+[% BLOCK renderLogLinks %]
+(<a href="[% url %]">log</a>, <a href="[% "$url/raw" %]">raw</a>, <a href="[% "$url/tail-reload" %]">tail</a>)
+[% END %]
diff --git a/src/root/deps.tt b/src/root/deps.tt
index 8a25492d..80c2a92f 100644
--- a/src/root/deps.tt
+++ b/src/root/deps.tt
@@ -6,40 +6,49 @@
 [% jobset = build.jobset %]
 [% job = build.job %]
 
-<a name="runtime"></a>
-[% IF available %]
-<h1>Runtime dependencies</h1>
-<ul>
-[% FOREACH dep IN runtimedeps -%]
+[% BLOCK renderNode %]
   <li>
-    [% IF dep.buildstep %]
-      <a href="[% c.uri_for('/build' dep.buildstep.get_column('build') 'nixlog' dep.buildstep.stepnr) %]">[% dep.path %]</a>
+    [% IF done.${node.path} %]
+      <p><tt>[% node.name %]</tt> (<em>repeated</em>)</p>
     [% ELSE %]
-      [% dep.path %]
+      [% done.${node.path} = 1 %]
+      <p>
+        [% IF node.buildStep %]
+          <a href="[% c.uri_for('/build' node.buildStep.get_column('build')) %]"><tt>[% node.name %]</tt></a> [%
+            IF log_exists(node.buildStep.drvpath);
+            INCLUDE renderLogLinks url=c.uri_for('/build' node.buildStep.get_column('build') 'nixlog' node.buildStep.stepnr);
+            END %]
+        [% ELSE %]
+          <tt>[% node.name %]</tt>
+        [% END %]
+      </p>
+      [% IF node.refs.size > 0 %]
+        <ul>
+          [% FOREACH ref IN node.refs; INCLUDE renderNode node=ref; END %]
+        </ul>
+      [% END %]
     [% END %]
   </li>
 [% END %]
+
+<a name="runtime"></a>
+<h2>Runtime dependency graph</h2>
+[% IF available %]
+<ul>
+  [% done={}; FOREACH node IN runtimeGraph; INCLUDE renderNode; END %]
 </ul>
 [% ELSE %]
-Path not available anymore!<br />
+<p><em>No longer available.</em></p>
 [% END %]
 
 <a name="buildtime"></a>
+<h2>Build-time dependency graph</h2>
 [% IF drvAvailable %]
-<h1>Build time dependencies</h1>
 <ul>
-[% FOREACH dep IN buildtimedeps -%]
-  <li>
-    [% IF dep.buildstep %]
-      <a href="[% c.uri_for('/build' dep.buildstep.get_column('build') 'nixlog' dep.buildstep.stepnr) %]">[% dep.path %]</a>
-    [% ELSE %]
-      [% dep.path %]
-    [% END %]
-  </li>
-[% END %]
+  [% INCLUDE renderNode node=buildTimeGraph %]
 </ul>
 [% ELSE %]
-Derivation not available anymore!<br />
+<p><em>No longer available.</em></p>
 [% END %]
 
 [% END %]