diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index c38518e4..8b3455c2 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -62,6 +62,9 @@ num=480
 filename=`prep_file $num`
 $binpath/largeiptc-test $filename ../data/imagemagick.png
 
+num=495
+filename=`prep_file $num`
+$binpath/exiv2 -pi $filename
 ) > $results 2>&1
 
 if [ x"`which unix2dos.exe`" != x ]; then
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index 94bc97e7..517e0f39 100644
--- a/test/data/bugfixes-test.out
+++ b/test/data/bugfixes-test.out
@@ -243,3 +243,10 @@ IRB buffer : 144788
 Comparing IPTC and IRB size... ok
 Comparing IPTC and IRB data... ok
 Caught Exiv2 exception 'Size of IPTC JPEG segment is larger than 65535 bytes'
+------> Bug 495 <-------
+Error: Directory Iop with 768 entries considered invalid; not read.
+Warning: IFD1: Pointer to next IFD is out of bounds; ignored.
+Error: Upper boundary of the 1st data entry of IFD1 is out of bounds:
+ Offset = 0x0203fa04, exceeds buffer size by 168813082 Bytes
+Exiv2 exception in print action for file exiv2-bug495.jpg:
+Failed to decode Exif metadata
diff --git a/test/data/exiv2-bug495.jpg b/test/data/exiv2-bug495.jpg
new file mode 100644
index 00000000..aebe353e
Binary files /dev/null and b/test/data/exiv2-bug495.jpg differ