diff --git a/Tests/test_file_jpeg2k.py b/Tests/test_file_jpeg2k.py
index a0b302ddc..25e1325c4 100644
--- a/Tests/test_file_jpeg2k.py
+++ b/Tests/test_file_jpeg2k.py
@@ -429,8 +429,9 @@ def test_pclr() -> None:
 
 
 def test_comment() -> None:
-    with Image.open("Tests/images/comment.jp2") as im:
-        assert im.info["comment"] == b"Created by OpenJPEG version 2.5.0"
+    for path in ("Tests/images/9bit.j2k", "Tests/images/comment.jp2"):
+        with Image.open(path) as im:
+            assert im.info["comment"] == b"Created by OpenJPEG version 2.5.0"
 
     # Test an image that is truncated partway through a codestream
     with open("Tests/images/comment.jp2", "rb") as fp:
diff --git a/docs/releasenotes/11.1.0.rst b/docs/releasenotes/11.1.0.rst
index c5d0afd58..cccf2323d 100644
--- a/docs/releasenotes/11.1.0.rst
+++ b/docs/releasenotes/11.1.0.rst
@@ -52,6 +52,12 @@ zlib library, and what version of zlib-ng is being used::
 Other Changes
 =============
 
+Reading JPEG 2000 comments
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+When opening a JPEG 2000 image, the comment may now be read into
+:py:attr:`~PIL.Image.Image.info` for J2K images, not just JP2 images.
+
 zlib-ng in wheels
 ^^^^^^^^^^^^^^^^^
 
diff --git a/src/PIL/Jpeg2KImagePlugin.py b/src/PIL/Jpeg2KImagePlugin.py
index f4bb9c445..9d078410f 100644
--- a/src/PIL/Jpeg2KImagePlugin.py
+++ b/src/PIL/Jpeg2KImagePlugin.py
@@ -253,6 +253,7 @@ class Jpeg2KImageFile(ImageFile.ImageFile):
         if sig == b"\xff\x4f\xff\x51":
             self.codec = "j2k"
             self._size, self._mode = _parse_codestream(self.fp)
+            self._parse_comment()
         else:
             sig = sig + self.fp.read(8)
 
@@ -263,6 +264,9 @@ class Jpeg2KImageFile(ImageFile.ImageFile):
                 if dpi is not None:
                     self.info["dpi"] = dpi
                 if self.fp.read(12).endswith(b"jp2c\xff\x4f\xff\x51"):
+                    hdr = self.fp.read(2)
+                    length = _binary.i16be(hdr)
+                    self.fp.seek(length - 2, os.SEEK_CUR)
                     self._parse_comment()
             else:
                 msg = "not a JPEG 2000 file"
@@ -298,10 +302,6 @@ class Jpeg2KImageFile(ImageFile.ImageFile):
 
     def _parse_comment(self) -> None:
         assert self.fp is not None
-        hdr = self.fp.read(2)
-        length = _binary.i16be(hdr)
-        self.fp.seek(length - 2, os.SEEK_CUR)
-
         while True:
             marker = self.fp.read(2)
             if not marker:
diff --git a/src/libImaging/Jpeg2KDecode.c b/src/libImaging/Jpeg2KDecode.c
index fc927d2f0..4f185b529 100644
--- a/src/libImaging/Jpeg2KDecode.c
+++ b/src/libImaging/Jpeg2KDecode.c
@@ -640,7 +640,7 @@ j2k_decode_entry(Imaging im, ImagingCodecState state) {
     opj_dparameters_t params;
     OPJ_COLOR_SPACE color_space;
     j2k_unpacker_t unpack = NULL;
-    size_t buffer_size = 0, tile_bytes = 0;
+    size_t tile_bytes = 0;
     unsigned n, tile_height, tile_width;
     int subsampling;
     int total_component_width = 0;
@@ -870,7 +870,7 @@ j2k_decode_entry(Imaging im, ImagingCodecState state) {
             tile_info.data_size = tile_bytes;
         }
 
-        if (buffer_size < tile_info.data_size) {
+        if (tile_info.data_size > 0) {
             /* malloc check ok, overflow and tile size sanity check above */
             UINT8 *new = realloc(state->buffer, tile_info.data_size);
             if (!new) {
@@ -883,7 +883,6 @@ j2k_decode_entry(Imaging im, ImagingCodecState state) {
                to valgrind errors. */
             memset(new, 0, tile_info.data_size);
             state->buffer = new;
-            buffer_size = tile_info.data_size;
         }
 
         if (!opj_decode_tile_data(