diff --git a/pagure/templates/_render_repo.html b/pagure/templates/_render_repo.html
index cb01766..0fd735d 100644
--- a/pagure/templates/_render_repo.html
+++ b/pagure/templates/_render_repo.html
@@ -42,13 +42,11 @@
 {%- endmacro %}
 
 
-{% macro pagination_link(pagetitle, page, total, sorting=None) -%}
-{% set prev_page = "%s?%s=%s" % (request.base_url, pagetitle, page - 1) %}
-{% set next_page = "%s?%s=%s" % (request.base_url, pagetitle, page + 1) %}
-{% if sorting %}
-{% set prev_page = "%s&sorting=%s" % (prev_page, sorting) %}
-{% set next_page = "%s&sorting=%s" % (next_page, sorting) %}
-{% endif %}
+{% macro pagination_link(pagetitle, page, total) -%}
+{% set prev_page = request.url | combine_url(
+    page=page-1, pagetitle=pagetitle, **kwargs) %}
+{% set next_page = request.url | combine_url(
+    page=page+1, pagetitle=pagetitle, **kwargs) %}
 <aside>
     <nav class="text-center">
       <ul class="pagination">
@@ -90,7 +88,7 @@
         <div class="row">
           <div class="col-sm-6">
             {% if total and total > 1 %}
-            {{ pagination_link(pagetitle, page, total, sorting) }}
+            {{ pagination_link(pagetitle, page, total, sorting=sorting) }}
             {% endif %}
           </div>
           <div class="col-sm-6 text-xs-right">
@@ -128,7 +126,7 @@
             {{ render_row(list) }}
         </div>
         {% if total and total > 1 %}
-        {{ pagination_link(pagetitle, page, total, sorting) }}
+        {{ pagination_link(pagetitle, page, total, sorting=sorting) }}
         {% endif %}
     </section>
 {% endmacro %}
diff --git a/pagure/ui/filters.py b/pagure/ui/filters.py
index e0a558b..c8f365e 100644
--- a/pagure/ui/filters.py
+++ b/pagure/ui/filters.py
@@ -15,6 +15,7 @@
 
 import datetime
 import textwrap
+import urlparse
 
 import arrow
 import flask
@@ -437,3 +438,16 @@ def convert_unicode(text):
         return text.decode("utf8")
     else:
         return text
+
+
+@APP.template_filter('combine_url')
+def combine_url(url, page, pagetitle, **kwargs):
+    """ Add the specified arguments in the provided kwargs dictionary to
+    the given URL.
+    """
+    url_obj = urlparse.urlparse(url)
+    url = url_obj.geturl().replace(url_obj.query, '')
+    query = dict(urlparse.parse_qsl(url_obj.query))
+    query[pagetitle] = page
+    query.update(kwargs)
+    return url + '&'.join(['%s=%s' % (k, query[k]) for k in query])