diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst
index d992b0011dc..6627bec7982 100644
--- a/Doc/library/asyncio-task.rst
+++ b/Doc/library/asyncio-task.rst
@@ -498,6 +498,8 @@ Waiting Primitives
    set concurrently and block until the condition specified
    by *return_when*.
 
+   The *aws* set must not be empty.
+
    Returns two sets of Tasks/Futures: ``(done, pending)``.
 
    Usage::
diff --git a/Misc/ACKS b/Misc/ACKS
index 9221f6aae43..f744de6b1f6 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1443,6 +1443,7 @@ Mike Romberg
 Armin Ronacher
 Case Roole
 Timothy Roscoe
+Joel Rosdahl
 Erik Rose
 Mark Roseman
 Josh Rosenberg
diff --git a/Misc/NEWS.d/next/Documentation/2020-05-04-14-20-02.bpo-40499.tjLSo8.rst b/Misc/NEWS.d/next/Documentation/2020-05-04-14-20-02.bpo-40499.tjLSo8.rst
new file mode 100644
index 00000000000..2b7eccbf0ef
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2020-05-04-14-20-02.bpo-40499.tjLSo8.rst
@@ -0,0 +1 @@
+Mention that :func:`asyncio.wait` requires a non-empty set of awaitables.