diff --git a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStream.java b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStream.java
index 9ee10865..87dd6004 100644
--- a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStream.java
+++ b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStream.java
@@ -101,8 +101,18 @@ final class JPEGSegmentImageInputStream extends ImageInputStreamImpl {
                         segments.add(segment);
                     }
                     else {
-                        int length = stream.readUnsignedShort(); // Length including length field itself
-                        segment = new Segment(marker, realPosition, segment.end(), 2 + length);
+                        long length;
+
+                        if (marker == JPEG.SOS) {
+                            // Treat rest of stream as a single segment (scanning for EOI is too much work)
+                            length = Long.MAX_VALUE - realPosition;
+                        }
+                        else {
+                            // Length including length field itself
+                            length = stream.readUnsignedShort() + 2;
+                        }
+
+                        segment = new Segment(marker, realPosition, segment.end(), length);
                         segments.add(segment);
                     }
 
diff --git a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
index f9c1a61d..6fa34246 100644
--- a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
+++ b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
@@ -276,6 +276,22 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTestCase<JPEGImageRe
         // TODO: Need to test colors!
     }
 
+    @Test
+    public void testEOFSOSSegment() throws IOException {
+        // Regression...
+        JPEGImageReader reader = createReader();
+        reader.setInput(ImageIO.createImageInputStream(getClassLoaderResource("/jpeg/eof-sos-segment-bug.jpg")));
+
+        assertEquals(266, reader.getWidth(0));
+        assertEquals(400, reader.getHeight(0));
+
+        BufferedImage image = reader.read(0);
+
+        assertNotNull(image);
+        assertEquals(266, image.getWidth());
+        assertEquals(400, image.getHeight());
+    }
+
     @Test
     public void testInvalidICCSingleChunkBadSequence() throws IOException {
         // Regression
diff --git a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStreamTest.java b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStreamTest.java
index 5749593c..762e7484 100644
--- a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStreamTest.java
+++ b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStreamTest.java
@@ -123,4 +123,16 @@ public class JPEGSegmentImageInputStreamTest {
 
         // And thus, no XMP, no ICC_PROFILE or other segments
     }
+
+    @Test
+    public void testEOFSOSSegmentBug() throws IOException {
+        ImageInputStream stream = new JPEGSegmentImageInputStream(ImageIO.createImageInputStream(getClassLoaderResource("/jpeg/eof-sos-segment-bug.jpg")));
+
+        long length = 0;
+        while (stream.read() != -1) {
+            length++;
+        }
+
+        assertEquals(9299l, length); // Sanity check: same as file size
+    }
 }
diff --git a/imageio/imageio-jpeg/src/test/resources/jpeg/eof-sos-segment-bug.jpg b/imageio/imageio-jpeg/src/test/resources/jpeg/eof-sos-segment-bug.jpg
new file mode 100644
index 00000000..c1d2d973
Binary files /dev/null and b/imageio/imageio-jpeg/src/test/resources/jpeg/eof-sos-segment-bug.jpg differ