diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index 2432a171..72509431 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -234,6 +234,19 @@ cp -f ../data/mini9.tif $filename
 $bin/exiv2 -v -Qd -M'set Exif.Image.ImageDescription Just GIMP' $filename
 $bin/exiv2 -v -pa $filename
 
+num=836
+filename=exiv2-bug$num.eps
+echo '------>' Bug $num '<-------' >&2
+if [ -e $filename/rsrc ]; then
+    printf "$num " >&3
+    cp $filename.rsrc $filename/rsrc
+    $bin/exiv2 -M'set Exif.Photo.UserComment Test' $filename
+    diff -q $filename/rsrc $filename.rsrc
+else
+    # skip this test on systems which do not have resource forks
+    printf "($num skipped) " >&3
+fi
+
 ) 3>&1 > $results 2>&1
 
 printf "\n"
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index 547f1756..c78ecaf9 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ
diff --git a/test/data/exiv2-bug836.eps b/test/data/exiv2-bug836.eps
new file mode 100644
index 00000000..3c6634b9
Binary files /dev/null and b/test/data/exiv2-bug836.eps differ
diff --git a/test/data/exiv2-bug836.eps.rsrc b/test/data/exiv2-bug836.eps.rsrc
new file mode 100644
index 00000000..7358ef53
Binary files /dev/null and b/test/data/exiv2-bug836.eps.rsrc differ