diff --git a/src/lib/Hydra/Base/Controller/ListBuilds.pm b/src/lib/Hydra/Base/Controller/ListBuilds.pm
index e10d45ce..f554803e 100644
--- a/src/lib/Hydra/Base/Controller/ListBuilds.pm
+++ b/src/lib/Hydra/Base/Controller/ListBuilds.pm
@@ -47,11 +47,11 @@ sub errors : Chained('get_builds') PathPart Args(0) {
 
     
 sub all : Chained('get_builds') PathPart {
-    my ($self, $c, $page) = @_;
+    my ($self, $c) = @_;
 
     $c->stash->{template} = 'all.tt';
 
-    $page = (defined $page ? int($page) : 1) || 1;
+    my $page = int($c->req->param('page')) || 1;
 
     my $resultsPerPage = 50;
 
diff --git a/src/root/all.tt b/src/root/all.tt
index 931686c7..69e3f41b 100644
--- a/src/root/all.tt
+++ b/src/root/all.tt
@@ -11,13 +11,13 @@ out of [% totalBuilds %] in order of descending timestamp.</p>
 
 [% INCLUDE renderBuildList %]
 
-[<a href="[% "$baseUri/1" %]">First</a>]
+[<a href="[% "$baseUri?page=1" %]">First</a>]
 [% IF page > 1 %]
-  [<a href="[% "$baseUri/"; (page - 1) %]">Prev</a>]
+  [<a href="[% "$baseUri?page="; (page - 1) %]">Prev</a>]
 [% END %]
 [% IF page * resultsPerPage < totalBuilds %]
-  [<a href="[% "$baseUri/"; (page + 1) %]">Next</a>]
+  [<a href="[% "$baseUri?page="; (page + 1) %]">Next</a>]
 [% END %]
-[<a href="[% "$baseUri/"; (totalBuilds - 1) div resultsPerPage + 1 %]">Last</a>]
+[<a href="[% "$baseUri?page="; (totalBuilds - 1) div resultsPerPage + 1 %]">Last</a>]
 
 [% END %]