diff --git a/src/lib/Hydra/Controller/Build.pm b/src/lib/Hydra/Controller/Build.pm
index fc07be6f..e72a7a70 100644
--- a/src/lib/Hydra/Controller/Build.pm
+++ b/src/lib/Hydra/Controller/Build.pm
@@ -385,4 +385,28 @@ sub add_to_release : Chained('build') PathPart('add-to-release') Args(0) {
 }
 
 
+sub clone : Chained('build') PathPart('clone') Args(0) {
+    my ($self, $c) = @_;
+
+    my $build = $c->stash->{build};
+    
+    requireProjectOwner($c, $build->project);
+
+    $c->stash->{template} = 'clone-build.tt';
+}
+
+
+sub clone_submit : Chained('build') PathPart('clone/submit') Args(0) {
+    my ($self, $c) = @_;
+
+    my $build = $c->stash->{build};
+    
+    requireProjectOwner($c, $build->project);
+
+    $c->flash->{buildMsg} = "Build XXX added to the queue.";
+    
+    $c->res->redirect($c->uri_for($c->controller('Root')->action_for('queue')));
+}
+
+
 1;
diff --git a/src/lib/Hydra/Controller/Root.pm b/src/lib/Hydra/Controller/Root.pm
index e1e1cc86..d2cd6551 100644
--- a/src/lib/Hydra/Controller/Root.pm
+++ b/src/lib/Hydra/Controller/Root.pm
@@ -60,6 +60,7 @@ sub queue :Local {
     $c->stash->{template} = 'queue.tt';
     $c->stash->{queue} = [$c->model('DB::Builds')->search(
         {finished => 0}, {join => 'schedulingInfo', order_by => ["priority DESC", "timestamp"]})];
+    $c->stash->{flashMsg} = $c->flash->{buildMsg};
 }
 
 
diff --git a/src/root/build.tt b/src/root/build.tt
index 7318e480..09cd78fa 100644
--- a/src/root/build.tt
+++ b/src/root/build.tt
@@ -211,7 +211,6 @@
   [% END %]
 </table>
 
-
 [% IF c.user_exists && available %]
 <form action="[% c.uri_for('/build' build.id 'add-to-release') %]" method="post">
   <p>Add to release: <input type="text" class="string" name="name" />
@@ -219,6 +218,9 @@
 </form>
 [% END %]
 
+[% IF c.user_exists %]
+<p>[<a href="[% c.uri_for('/build' build.id 'clone') %]">Clone this build</a>]</p>
+[% END %]
 
 
 [% IF build.buildproducts %]
diff --git a/src/root/clone-build.tt b/src/root/clone-build.tt
new file mode 100644
index 00000000..560c9634
--- /dev/null
+++ b/src/root/clone-build.tt
@@ -0,0 +1,48 @@
+[% WRAPPER layout.tt title="Clone Build" %]
+[% PROCESS common.tt %]
+[% USE HTML %]
+[% edit=1 %]
+
+<h1>Clone Build</h1>
+
+<p>Cloning allows you to perform a build with modified inputs.</p>
+
+<form action="[% c.uri_for('/build' build.id 'clone' 'submit') %]" method="post">
+
+  <h2>Nix expression</h2>
+
+  <p>Evaluate job <tt><input type="text" class="string"
+  name="jobname" [% HTML.attributes(value => build.job.name) %]
+  /></tt> in Nix expression <tt><input type="text" class="string"
+  name="nixexprpath" [% HTML.attributes(value => build.nixexprpath) %]
+  /></tt> in input <tt><input type="text" class="string"
+  name="nixexprinput" [% HTML.attributes(value => build.nixexprinput)
+  %] /></tt>.</p>
+
+  <h2>Build inputs</h2>
+
+  <table class="tablesorter">
+    <thead>
+      <tr><th>Name</th><th>Type</th><th>Value</th></tr>
+    </thead>
+    <tbody>
+      [% FOREACH input IN build.inputs -%]
+        <tr>
+          <td><tt>[% input.name %]</tt></td>
+          <td>
+            [% INCLUDE renderSelection curValue=input.type param="input-$input.name-type" options=inputTypes %]
+          </td>
+          <td>
+            <tt><input type="text" class="string" name="input-[% input.name %]-value"
+              [% HTML.attributes(value => input.value || input.uri || input.dependency.id) %] /></tt>
+          </td>
+        </tr>
+      [% END -%]
+    </tbody>
+  </table>
+  
+  <p><button type="submit"><img alt="Add" src="/static/images/success.gif" />Add to queue</button></p>
+
+</form>
+
+[% END %]
diff --git a/src/root/project.tt b/src/root/project.tt
index 2980052d..2b36cecf 100644
--- a/src/root/project.tt
+++ b/src/root/project.tt
@@ -95,7 +95,7 @@
 
 [% END %]
 
-<a href="[% c.uri_for(c.controller('Project').action_for('create_jobset'), [project.name]) %]">[Create a new jobset]</a>
+<p><a href="[% c.uri_for(c.controller('Project').action_for('create_jobset'), [project.name]) %]">[Create a new jobset]</a></p>
 
 
 <h2>Views</h2>
diff --git a/src/root/queue.tt b/src/root/queue.tt
index 86efed27..4b954532 100644
--- a/src/root/queue.tt
+++ b/src/root/queue.tt
@@ -3,6 +3,10 @@
 
 <h1>Hydra Queue</h1>
 
+[% IF flashMsg %]
+<p class="error">[% flashMsg %]</p>
+[% END %]
+
 [% IF queue.size == 0 %]
 
   <p>The queue is empty.</p>