diff --git a/Doc/library/htmllib.rst b/Doc/library/htmllib.rst
index 16c1b3586c4..aa07fdb06ae 100644
--- a/Doc/library/htmllib.rst
+++ b/Doc/library/htmllib.rst
@@ -157,8 +157,10 @@ additional methods and instance variables for use within tag methods.
.. sectionauthor:: Fred L. Drake, Jr.
.. note::
+
The :mod:`htmlentitydefs` module has been renamed to :mod:`html.entities` in
- Python 3.0.
+ Python 3.0. The :term:`2to3` tool will automatically adapt imports when
+ converting your sources to 3.0.
This module defines three dictionaries, ``name2codepoint``, ``codepoint2name``,
diff --git a/Doc/library/htmlparser.rst b/Doc/library/htmlparser.rst
index 3019eb4699f..a5c185cd736 100644
--- a/Doc/library/htmlparser.rst
+++ b/Doc/library/htmlparser.rst
@@ -6,8 +6,10 @@
:synopsis: A simple parser that can handle HTML and XHTML.
.. note::
- The :mod:`HTMLParser` module has been renamed to
- :mod:`html.parser` in Python 3.0.
+
+ The :mod:`HTMLParser` module has been renamed to :mod:`html.parser` in Python
+ 3.0. The :term:`2to3` tool will automatically adapt imports when converting
+ your sources to 3.0.
.. versionadded:: 2.2