diff --git a/src/lib/Hydra/Controller/Build.pm b/src/lib/Hydra/Controller/Build.pm
index d62a4634..964d9670 100644
--- a/src/lib/Hydra/Controller/Build.pm
+++ b/src/lib/Hydra/Controller/Build.pm
@@ -357,4 +357,28 @@ sub keep : Chained('build') PathPart Args(1) {
 }
 
 
+sub add_to_release : Chained('build') PathPart('add-to-release') Args(0) {
+    my ($self, $c) = @_;
+
+    my $build = $c->stash->{build};
+    
+    requireProjectOwner($c, $build->project);
+
+    my $releaseName = trim $c->request->params->{name};
+
+    my $release = $build->project->releases->find({name => $releaseName});
+    
+    error($c, "This project has no release named `$releaseName'.") unless $release;
+
+    error($c, "This build is already a part of release `$releaseName'.")
+        if $release->releasemembers->find({build => $build->id});
+
+    $release->releasemembers->create({build => $build->id, description => $build->description});
+    
+    $c->flash->{buildMsg} = "Build added to project <tt>$releaseName</tt>.";
+    
+    $c->res->redirect($c->uri_for($self->action_for("view_build"), $c->req->captures));
+}
+
+
 1;
diff --git a/src/root/build.tt b/src/root/build.tt
index fd28cdc7..2460380c 100644
--- a/src/root/build.tt
+++ b/src/root/build.tt
@@ -206,6 +206,15 @@
 </table>
 
 
+[% IF c.user_exists %]
+<form action="[% c.uri_for('/build' build.id 'add-to-release') %]" method="post">
+  <p>Add to release: <input type="text" class="string" name="name" />
+  <button type="submit"><img src="/static/images/success.gif" />Apply</button></p>
+</form>
+[% END %]
+
+
+
 [% IF build.buildproducts %]
 
 <h2>Build products</h2>
diff --git a/src/root/edit-release.tt b/src/root/edit-release.tt
index f63b1977..c8af301e 100644
--- a/src/root/edit-release.tt
+++ b/src/root/edit-release.tt
@@ -17,6 +17,9 @@
     </tr>
   </table>
 
+  <p><em>Note:</em> to add a build to this release, go to the build’s
+  information page and click on “Add to release”.</p>
+
   <p><button type="submit"><img src="/static/images/success.gif" />[%IF create %]Create[% ELSE %]Apply changes[% END %]</button></p>
   
 </form>
@@ -24,7 +27,7 @@
 [% IF !create %]
 
   <form action="[% c.uri_for('/release' project.name release.name 'delete') %]" method="post">
-    <p><button id="delete-release" type="submit"><img src="/static/images/failure.gif" />Delete this release</button></p>
+    <p><a id="delete-release" type="submit"><img src="/static/images/failure.gif" />Delete this release</button></p>
   </form>
 
   <script type="text/javascript">
diff --git a/src/root/release.tt b/src/root/release.tt
index fed40381..2c5a387d 100644
--- a/src/root/release.tt
+++ b/src/root/release.tt
@@ -1,10 +1,32 @@
 [% WRAPPER layout.tt title="Release ‘$release.name’" %]
 [% PROCESS common.tt %]
+[% PROCESS "product-list.tt" %]
 [% USE HTML %]
 
 <h1>Release <tt>[% release.name %]</tt> <a
 class="smallLink" href="[% c.uri_for('/release' project.name release.name "edit") %]">[Edit]</a></h1>
 
-<p><em>Released on [% INCLUDE renderDateTime timestamp = release.timestamp %].</em></p>
+<p><em>Released on [% INCLUDE renderDateTime timestamp =
+release.timestamp %].</em></p>
+
+[% IF !release.releasemembers %]
+
+<p><em>No builds have been added to this release yet.</em></p>
+
+[% ELSE %]
+
+[% FOREACH m IN release.releasemembers %]
+
+  <h2>
+    <a href="[% c.uri_for('/build' m.build.id) %]">
+      [% HTML.escape(m.description) %]
+    </a>
+  </h2>
+
+  [% INCLUDE renderProductList build=m.build latestRoot=['/view!!!' project.name view.name 'latest' j.job.job] %]
+
+[% END %]
+
+[% END %]
 
 [% END %]
diff --git a/src/root/releases.tt b/src/root/releases.tt
index 2ed33f18..27a93ad2 100644
--- a/src/root/releases.tt
+++ b/src/root/releases.tt
@@ -4,18 +4,14 @@
 
 <h1>Releases for Project <tt>[% project.name %]</tt></h1>
 
-[% IF c.user_exists %]
-<p>
-[<a href="[% c.uri_for('/project' project.name 'create-release') %]">Create a release</a>]
-</p>
-[% END %]
-
 [% IF releases.size == 0 %]
 
 <p><em>This project has no releases yet.</em></p>
 
 [% ELSE %]
 
+<p>This project has made the following releases:</p>
+
 <ul>
   [% FOREACH release IN releases %]
     <li><a href="[% c.uri_for('/release' project.name release.name) %]"><tt>[% release.name %]</tt></a></li>
@@ -24,5 +20,10 @@
 
 [% END %]
 
+[% IF c.user_exists %]
+<p>
+[<a href="[% c.uri_for('/project' project.name 'create-release') %]">Create a release</a>]
+</p>
+[% END %]
 
 [% END %]