diff --git a/CHANGELOG b/CHANGELOG
index d2b8dfddd..f52cc5ede 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@ Changes between 1.2.1 and XXX
 =====================================
 
 - added links to the new capturelog and coverage plugins 
+- (issue87) fix unboundlocal error in assertionold code 
+- (issue86) improve documentation for looponfailing
 
 
 Changes between 1.2.1 and 1.2.0
diff --git a/doc/test/features.txt b/doc/test/features.txt
index be153a034..ed2060173 100644
--- a/doc/test/features.txt
+++ b/doc/test/features.txt
@@ -176,7 +176,8 @@ advanced test selection and running modes
 
 .. _`selection by keyword`: 
 
-``py.test --looponfailing`` allows to run a test suite, 
+``py.test --looponfailing`` (implemented through the external
+`pytest-xdist`_ plugin) allows to run a test suite, 
 memorize all failures and then loop over the failing set
 of tests until they all pass.  It will re-start running
 the tests when it detects file changes in your project.