diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index a01ebbd..e6b1974 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -465,8 +465,8 @@ For passing messages one can use :func:`Pipe` (for a connection between two
 processes) or a queue (which allows multiple producers and consumers).
 
 The :class:`Queue` and :class:`JoinableQueue` types are multi-producer,
-multi-consumer FIFO queues modelled on the :class:`Queue.Queue` class in the
-standard library.  They differ in that :class:`Queue` lacks the
+multi-consumer queues modelled on the :class:`Queue.Queue` class in the
+standard library. They differ in that :class:`Queue` lacks the
 :meth:`~Queue.Queue.task_done` and :meth:`~Queue.Queue.join` methods introduced
 into Python 2.5's :class:`Queue.Queue` class.
 
@@ -487,6 +487,10 @@ Note that one can also create a shared queue by using a manager object -- see
 
 
 .. warning::
+    :class:`Queue` does not guarantee FIFO ordering under all circumstances.
+    See :issue:`4999` for additional information.
+
+.. warning::
 
    If a process is killed using :meth:`Process.terminate` or :func:`os.kill`
    while it is trying to use a :class:`Queue`, then the data in the queue is