diff --git a/src/HydraFrontend/lib/HydraFrontend/Controller/Root.pm b/src/HydraFrontend/lib/HydraFrontend/Controller/Root.pm
index 8fac493e..c7608337 100644
--- a/src/HydraFrontend/lib/HydraFrontend/Controller/Root.pm
+++ b/src/HydraFrontend/lib/HydraFrontend/Controller/Root.pm
@@ -162,6 +162,21 @@ sub loadLog {
 }
 
 
+sub download :Local {
+    my ( $self, $c, $id, $productnr, $filename ) = @_;
+
+    my $build = getBuild($c, $id);
+    return error($c, "Build with ID $id doesn't exist.") if !defined $build;
+
+    my $product = $build->buildproducts->find({productnr => $productnr});
+    return error($c, "Build $id doesn't have a product $productnr.") if !defined $product;
+
+    return error($c, "File " . $product->path . " has disappeared.") unless -e $product->path;
+
+    $c->serve_static_file($product->path);
+}
+    
+    
 sub end : ActionClass('RenderView') {}
 
 
diff --git a/src/HydraFrontend/root/build.tt b/src/HydraFrontend/root/build.tt
index a859ef97..672c01fc 100644
--- a/src/HydraFrontend/root/build.tt
+++ b/src/HydraFrontend/root/build.tt
@@ -197,14 +197,16 @@
     [% CASE "nix-build" %]
       Nix build of path <tt>[% product.path %]</tt>
     [% CASE "file" %]
-      [% SWITCH product.subtype %]
-      [% CASE "source-dist" %]
-        <img src="/static/images/source-dist.png" alt="Source" /> Source distribution <tt>[% product.name %]</tt>
-      [% CASE "rpm" %]
-        <img src="/static/images/rpm-fedora.png" alt="RPM" /> RPM package <tt>[% product.name %]</tt>
-      [% CASE DEFAULT %]
-        File <tt>[% product.path %]</tt> of type <tt>[% product.subtype %]</tt>
-      [% END %]
+      <a href="[% c.uri_for('/download' build.id product.productnr product.name) %]">
+        [% SWITCH product.subtype %]
+        [% CASE "source-dist" %]
+          <img src="/static/images/source-dist.png" alt="Source" /> Source distribution <tt>[% product.name %]</tt>
+        [% CASE "rpm" %]
+          <img src="/static/images/rpm-fedora.png" alt="RPM" /> RPM package <tt>[% product.name %]</tt>
+        [% CASE DEFAULT %]
+          File <tt>[% product.name %]</tt> of type <tt>[% product.subtype %]</tt>
+        [% END %]
+      </a>
       [<a href="javascript:" onclick="javascript:$('#foo-[% product.productnr %]').toggle()">details</a>]
       <div class="productDetails" id="foo-[% product.productnr %]">
         <table>