diff --git a/.cvsignore b/.cvsignore
index 853f786..17795e0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libexif-0.6.13.tar.bz2
+libexif-0.6.16.tar.bz2
diff --git a/libexif.spec b/libexif.spec
index c617e97..9dea30e 100644
--- a/libexif.spec
+++ b/libexif.spec
@@ -1,15 +1,15 @@
 Summary: Library for extracting extra information from image files
 Name: libexif
-Version: 0.6.15
-Release: 6%{?dist}
+Version: 0.6.16
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2+
 URL: http://libexif.sourceforge.net/
 Source0: libexif-%{version}.tar.bz2 
 Source1: libexif-docs.tar.gz
-Patch0: libexif-cve-2007-4168.patch
 Patch1: cve-2007-6351.patch
 Patch2: cve-2007-6352.patch
+Patch3: olympus-byte-order.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: doxygen
 
@@ -30,9 +30,9 @@ for writing programs that use libexif.
 
 %prep
 %setup -q
-%patch0 -p1 -b .cve-2007-4168
 %patch1 -p1 -b .cve-2007-6351
 %patch2 -p1 -b .cve-2007-6352
+%patch3 -p1 -b .olympus-byte-order
 
 # to avoid multilib conflicts, we toss in pre-generated docs
 # and neuter make all in the docs dir
@@ -76,6 +76,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexif.pc
 
 %changelog
+* Tue Feb  5 2008 Matthias Clasen <mclasen@redhat.com> - 0.6.16-1
+- Update to 0.6.16
+- Drop obsolete patch
+
 * Tue Feb  5 2008 Matthias Clasen <mclasen@redhat.com> - 0.6.15-6
 - Convert doc files to utf-8 (#240838)
 
diff --git a/olympus-byte-order.patch b/olympus-byte-order.patch
new file mode 100644
index 0000000..282f2d0
--- /dev/null
+++ b/olympus-byte-order.patch
@@ -0,0 +1,36 @@
+diff -up libexif-0.6.15/libexif/olympus/exif-mnote-data-olympus.c.olympus-byte-order libexif-0.6.15/libexif/olympus/exif-mnote-data-olympus.c
+--- libexif-0.6.15/libexif/olympus/exif-mnote-data-olympus.c.olympus-byte-order	2008-02-05 19:54:41.000000000 -0500
++++ libexif-0.6.15/libexif/olympus/exif-mnote-data-olympus.c	2008-02-05 19:59:28.000000000 -0500
+@@ -230,6 +230,15 @@ exif_mnote_data_olympus_load (ExifMnoteD
+ 		else if (buf[o2 + 6 + 1] == 1)
+ 			n->order = EXIF_BYTE_ORDER_MOTOROLA;
+ 		o2 += 8;
++		if (o2 >= buf_size) return;
++		c = exif_get_short (buf + o2, n->order);
++		if ((!(c & 0xFF)) && (c > 0x500)) {
++			if (n->order == EXIF_BYTE_ORDER_INTEL) {
++				n->order = EXIF_BYTE_ORDER_MOTOROLA;
++			} else {
++				n->order = EXIF_BYTE_ORDER_INTEL;
++			}
++		}
+ 
+ 	} else if (!memcmp (buf + o2, "OLYMPUS", 8)) {
+ 		/* Olympus S760, S770 */
+@@ -267,6 +276,16 @@ exif_mnote_data_olympus_load (ExifMnoteD
+ 		case nikonV1:
+ 
+ 			base = MNOTE_NIKON1_TAG_BASE;
++			/* Fix endianness, if needed */
++			if (o2 >= buf_size) return;
++			c = exif_get_short (buf + o2, n->order);
++			if ((!(c & 0xFF)) && (c > 0x500)) {
++				if (n->order == EXIF_BYTE_ORDER_INTEL) {
++					n->order = EXIF_BYTE_ORDER_MOTOROLA;
++				} else {
++					n->order = EXIF_BYTE_ORDER_INTEL;
++				}
++			}
+ 			break;
+ 
+ 		case nikonV2:
diff --git a/sources b/sources
index fd40b43..84d04e1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-58871e364c454d107eee001456cc8f24  libexif-0.6.15.tar.bz2
-916f61beb4afa88f05130b10e7640333  libexif-docs.tar.gz
+deee153b1ded5a944ea05d041d959eca  libexif-0.6.16.tar.bz2