diff --git a/pep-0387.txt b/pep-0387.txt
index 942499c12..ca2667e43 100644
--- a/pep-0387.txt
+++ b/pep-0387.txt
@@ -102,7 +102,9 @@ releases:
    warn whenever it is entered.  ``DeprecationWarning`` is the usual
    warning category to use, but ``PendingDeprecationWarning`` may be
    used in special cases were the old and new versions of the API will
-   coexist for many releases.
+   coexist for many releases. The warning message should include the
+   release the incompatibility is expected to become the default and a
+   link to an issue that users can post feedback to.
 
 3. Wait for the warning to appear in at least two major Python
    versions. It's fine to wait more than two releases.