diff --git a/Doc/library/http.server.rst b/Doc/library/http.server.rst
index eb3a6a87a11..e6d3bb45ef0 100644
--- a/Doc/library/http.server.rst
+++ b/Doc/library/http.server.rst
@@ -507,6 +507,12 @@ the ``--cgi`` option::
 
         python -m http.server --cgi
 
+.. warning::
+
+   :class:`CGIHTTPRequestHandler` and the ``--cgi`` command line option
+   are not intended for use by untrusted clients and may be vulnerable
+   to exploitation. Always use within a secure environment.
+
 .. _http.server-security:
 
 Security Considerations