diff --git a/AUTHORS b/AUTHORS
index 8357d5e29..aa716a34f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -34,3 +34,4 @@ Andreas Zeidler
 Brian Okken
 Katarzyna Jachim
 Christian Theunert
+Anthon van der Neut
diff --git a/CHANGELOG b/CHANGELOG
index dda33f9d5..ee30b3d5d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
 Changes between 2.3.5 and 2.4.DEV
 -----------------------------------
 
+- integrate option tab-completion when argcomplete is used.  Thanks
+  Anthon van der Neut for the PR.  This also lets pytest use argparse
+  instead of optparse.
+
 - SO-17664702: call fixture finalizers even if the fixture function
   partially failed (finalizers would not always be called before)