diff --git a/AUTHORS b/AUTHORS
index d7422a07676..f6bd9191db6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -174,6 +174,7 @@ answer newbie questions, and generally made Django that much better:
     Daniele Procida <daniele@vurt.org>
     Daniel Greenfeld
     dAniel hAhler
+    Daniel Jilg <daniel@breakthesystem.org>
     Daniel Lindsley <daniel@toastdriven.com>
     Daniel Poelzleithner <http://poelzi.org/>
     Daniel Pyrathon <pirosb3@gmail.com>
diff --git a/docs/topics/pagination.txt b/docs/topics/pagination.txt
index a45b8fabd60..9baa1879e14 100644
--- a/docs/topics/pagination.txt
+++ b/docs/topics/pagination.txt
@@ -146,6 +146,11 @@ Required arguments
     clause or with a default :attr:`~django.db.models.Options.ordering` on the
     model.
 
+    .. note::
+
+        If you are using a ``QuerySet`` with a very large number of items,
+        requesting high page numbers might be slow on some database backends.
+
 ``per_page``
     The maximum number of items to include on a page, not including orphans
     (see the ``orphans`` optional argument below).