diff --git a/Doc/library/shlex.rst b/Doc/library/shlex.rst
index f462244..bb05c7d 100644
--- a/Doc/library/shlex.rst
+++ b/Doc/library/shlex.rst
@@ -21,9 +21,7 @@
 writing minilanguages, (for example, in run control files for Python
 applications) or for parsing quoted strings.
 
-.. note::
-
-   The :mod:`shlex` module currently does not support Unicode input.
+Prior to Python 2.7.3, this module did not support Unicode input.
 
 The :mod:`shlex` module defines the following functions:
 
diff --git a/Misc/NEWS b/Misc/NEWS
index b4f9be2..7b793b2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -68,7 +68,8 @@
 
 - Issue #1548891: The cStringIO.StringIO() constructor now encodes unicode
   arguments with the system default encoding just like the write() method
-  does, instead of converting it to a raw buffer.
+  does, instead of converting it to a raw buffer.  This also fixes handling of
+  unicode input in the shlex module (#6988, #1170).
 
 - Issue #9168: now smtpd is able to bind privileged port.