diff --git a/.gitignore b/.gitignore
index 74f37dd..bcb6e1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 libgexiv2-0.1.0.tar.gz
 libgexiv2-0.1.90.tar.gz
 /libgexiv2-0.2.0.tar.bz2
+/libgexiv2-0.2.2.tar.bz2
diff --git a/gexiv2-0.2.1-exiv2-0.21.patch b/gexiv2-0.2.1-exiv2-0.21.patch
new file mode 100644
index 0000000..6e6a7af
--- /dev/null
+++ b/gexiv2-0.2.1-exiv2-0.21.patch
@@ -0,0 +1,35 @@
+diff -ur libgexiv2-0.2.1-orig/gexiv2/gexiv2-metadata-exif.cpp libgexiv2-0.2.1/gexiv2/gexiv2-metadata-exif.cpp
+--- libgexiv2-0.2.1-orig/gexiv2/gexiv2-metadata-exif.cpp	2010-09-10 17:52:54.000000000 -0400
++++ libgexiv2-0.2.1/gexiv2/gexiv2-metadata-exif.cpp	2010-12-19 19:44:49.883274002 -0500
+@@ -235,10 +235,13 @@
+ const gchar* gexiv2_metadata_get_exif_tag_label (const gchar* tag) {
+     g_return_val_if_fail(tag != NULL, NULL);
+     
+-    Exiv2::ExifKey key(tag);
+-    
+     try {
++        Exiv2::ExifKey key(tag);
++#if EXIV2_TEST_VERSION(0, 21, 0)
++        return g_intern_string(key.tagLabel().c_str());
++#else
+         return Exiv2::ExifTags::tagLabel (key.tag (), key.ifdId ());
++#endif
+     } catch (Exiv2::Error& e) {
+         LOG_ERROR(e);
+     }
+@@ -249,10 +252,13 @@
+ const gchar* gexiv2_metadata_get_exif_tag_description (const gchar* tag) {
+     g_return_val_if_fail(tag != NULL, NULL);
+     
+-    Exiv2::ExifKey key(tag);
+-    
+     try {
++        Exiv2::ExifKey key(tag);
++#if EXIV2_TEST_VERSION(0, 21, 0)
++        return g_intern_string(key.tagDesc().c_str());
++#else
+         return Exiv2::ExifTags::tagDesc (key.tag (), key.ifdId ());
++#endif
+     } catch (Exiv2::Error& e) {
+         LOG_ERROR(e);
+     }
diff --git a/libgexiv2.spec b/libgexiv2.spec
index cc0ff69..4e8973b 100644
--- a/libgexiv2.spec
+++ b/libgexiv2.spec
@@ -1,5 +1,5 @@
 Name:           libgexiv2
-Version:        0.2.0
+Version:        0.2.2
 Release:        1%{?dist}
 Summary:        Gexiv2 is a GObject-based wrapper around the Exiv2 library
 
@@ -11,6 +11,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  exiv2-devel gobject-introspection-devel libtool
 
+## upstream patches
+# see http://trac.yorba.org/ticket/2899
+Patch100: http://trac.yorba.org/raw-attachment/ticket/2899/gexiv2-0.2.1-exiv2-0.21.patch
 
 %description
 libgexiv2 is a GObject-based wrapper around the Exiv2 library. 
@@ -31,6 +34,8 @@ developing applications that use %{name}.
 %prep
 %setup -q
 
+%patch100 -p1 -b .exiv2_0_21
+
 %build
 ## configure fails with the error:
 ## configure: Invalid argument --program-prefix=
@@ -69,6 +74,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jan 01 2011 Rex Dieter <rdieter@fedoraproject.org> - 0.2.2-1
+- 0.2.2
+- exiv2-0.21 patch
+
 * Tue Aug 24 2010 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.2.0-1
 - update to latest upstream release
 
diff --git a/sources b/sources
index 005ef97..e6f8f92 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2bdedaa705260a1f36ae335a5a426f6a  libgexiv2-0.2.0.tar.bz2
+b914a6d4a78865ccfd2c91464c44431d  libgexiv2-0.2.2.tar.bz2