diff --git a/docs/handbook/image-file-formats.rst b/docs/handbook/image-file-formats.rst
index 21cd615fc..913c47c76 100644
--- a/docs/handbook/image-file-formats.rst
+++ b/docs/handbook/image-file-formats.rst
@@ -153,6 +153,92 @@ The :py:meth:`~PIL.Image.Image.save` method supports the following options:
     before building the Python Imaging Library. See the distribution README for
     details.
 
+JPEG 2000
+^^^^^^^^^
+
+PIL reads and writes JPEG 2000 files containing ``L``, ``LA``, ``RGB`` or
+``RGBA`` data.  It can also read files containing ``YCbCr`` data, which it
+converts on read into ``RGB`` or ``RGBA`` depending on whether or not there is
+an alpha channel.  PIL supports JPEG 2000 raw codestreams (``.j2k`` files), as
+well as boxed JPEG 2000 files (``.j2p`` or ``.jpx`` files).  PIL does *not*
+support files whose components have different sampling frequencies.
+
+When loading, if you set the ``mode`` on the image prior to the
+:py:meth:`~PIL.Image.Image.load` method being invoked, you can ask PIL to
+convert the image to either ``RGB`` or ``RGBA`` rather than choosing for
+itself.  It is also possible to set ``reduce`` to the number of resolutions to
+discard (each one reduces the size of the resulting image by a factor of 2),
+and ``layers`` to specify the number of quality layers to load.
+
+The :py:meth:`~PIL.Image.Image.save` method supports the following options:
+
+**offset**
+    The image offset, as a tuple of integers, e.g. (16, 16)
+
+**tile_offset**
+    The tile offset, again as a 2-tuple of integers.
+
+**tile_size**
+    The tile size as a 2-tuple.  If not specified, or if set to None, the
+    image will be saved without tiling.
+
+**quality_mode**
+    Either `"rates"` or `"dB"` depending on the units you want to use to
+    specify image quality.
+
+**quality_layers**
+    A sequence of numbers, each of which represents either an approximate size
+    reduction (if quality mode is `"rates"`) or a signal to noise ratio value
+    in decibels.  If not specified, defaults to a single layer of full quality.
+
+**num_resolutions**
+    The number of different image resolutions to be stored (which corresponds
+    to the number of Discrete Wavelet Transform decompositions plus one).
+
+**codeblock_size**
+    The code-block size as a 2-tuple.  Minimum size is 4 x 4, maximum is 1024 x
+    1024, with the additional restriction that no code-block may have more
+    than 4096 coefficients (i.e. the product of the two numbers must be no
+    greater than 4096).
+
+**precinct_size**
+    The precinct size as a 2-tuple.  Must be a power of two along both axes,
+    and must be greater than the code-block size.
+
+**irreversible**
+    If ``True``, use the lossy Irreversible Color Transformation
+    followed by DWT 9-7.  Defaults to ``False``, which means to use the
+    Reversible Color Transformation with DWT 5-3.
+
+**progression**
+    Controls the progression order; must be one of ``"LRCP"``, ``"RLCP"``,
+    ``"RPCL"``, ``"PCRL"``, ``"CPRL"``.  The letters stand for Component,
+    Position, Resolution and Layer respectively and control the order of
+    encoding, the idea being that e.g. an image encoded using LRCP mode can
+    have its quality layers decoded as they arrive at the decoder, while one
+    encoded using RLCP mode will have increasing resolutions decoded as they
+    arrive, and so on.
+
+**cinema_mode**
+    Set the encoder to produce output compliant with the digital cinema
+    specifications.  The options here are ``"no"`` (the default),
+    ``"cinema2k-24"`` for 24fps 2K, ``"cinema2k-48"`` for 48fps 2K, and
+    ``"cinema4k-24"`` for 24fps 4K.  Note that for compliant 2K files,
+    *at least one* of your image dimensions must match 2048 x 1080, while
+    for compliant 4K files, *at least one* of the dimensions must match
+    4096 x 2160.
+
+.. note::
+
+   To enable JPEG 2000 support, you need to build and install the OpenJPEG
+   library, version 2.0.0 or higher, before building the Python Imaging
+   Library.
+
+   Windows users can install the OpenJPEG binaries available on the
+   OpenJPEG website, but must add them to their PATH in order to use PIL (if
+   you fail to do this, you will get errors about not being able to load the
+   ``_imaging`` DLL).
+
 MSP
 ^^^
 
diff --git a/docs/plugins.rst b/docs/plugins.rst
index b92b500c1..001cee949 100644
--- a/docs/plugins.rst
+++ b/docs/plugins.rst
@@ -153,6 +153,14 @@ Plugin reference
     :undoc-members:
     :show-inheritance:
 
+:mod:`Jpeg2KImagePlugin` Module
+-----------------------------
+
+.. automodule:: PIL.Jpeg2KImagePlugin
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 :mod:`McIdasImagePlugin` Module
 -------------------------------