diff --git a/Lib/inspect.py b/Lib/inspect.py
index 2363826ab15..d3d946d525c 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -819,7 +819,7 @@ def getargvalues(frame):
     'varargs' and 'varkw' are the names of the * and ** arguments or None.
     'locals' is the locals dictionary of the given frame."""
     args, varargs, varkw = getargs(frame.f_code)
-    return args, varargs, varkw, frame.f_locals
+    return ArgInfo(args, varargs, varkw, frame.f_locals)
 
 def joinseq(seq):
     if len(seq) == 1:
diff --git a/Misc/NEWS b/Misc/NEWS
index 49846936707..c254787c8ef 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #4092: Return ArgInfo as promised in the documentation from
+  inspect.getargvalues.
+
 - Issue #4014: Don't claim that Python has an Alpha release status, in addition
   to claiming it is Mature.