diff --git a/CHANGELOG b/CHANGELOG
index b4770b7ff..5ba93603a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+Changes between 2.1.3 and [next version]
+----------------------------------------
+
+- fix issue83: link to generated funcarg list
+
 Changes between 2.1.2 and 2.1.3
 ----------------------------------------
 
diff --git a/doc/builtin.txt b/doc/builtin.txt
index ebee125ef..d788ecc7e 100644
--- a/doc/builtin.txt
+++ b/doc/builtin.txt
@@ -17,6 +17,9 @@ to get an overview on the globally available helpers.
 .. automodule:: pytest
     :members:
 
+
+.. _builtinfuncargs:
+
 Builtin function arguments
 -----------------------------------------------------
 
diff --git a/doc/funcargs.txt b/doc/funcargs.txt
index 489827cd5..d4b388d5b 100644
--- a/doc/funcargs.txt
+++ b/doc/funcargs.txt
@@ -38,6 +38,7 @@ very useful if you want to test e.g. against different database backends
 or with multiple numerical arguments sets and want to reuse the same set
 of test functions.
 
+py.test comes with :ref:`builtinfuncargs` and there are some refined usages in the examples section.
 
 .. _funcarg: