diff --git a/exempi-2.0.2.tar.bz2 b/exempi-2.0.2.tar.bz2
deleted file mode 100644
index a2cc668..0000000
--- a/exempi-2.0.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fa2fd1a2d91fbec0cabf42998434b6d16b24e3f72a9076f5c88aa014bf26c41f
-size 2897434
diff --git a/exempi-2.1.0.tar.bz2 b/exempi-2.1.0.tar.bz2
new file mode 100644
index 0000000..f372ff9
--- /dev/null
+++ b/exempi-2.1.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de94b0927ca0d00fbd344788962942cdc542a58761e726939e38418ea7ed73cc
+size 3196170
diff --git a/exempi-rpmlint.diff b/exempi-rpmlint.diff
new file mode 100644
index 0000000..b731500
--- /dev/null
+++ b/exempi-rpmlint.diff
@@ -0,0 +1,19 @@
+diff --git a/source/XMPFiles/FileHandlers/P2_Handler.cpp b/source/XMPFiles/FileHandlers/P2_Handler.cpp
+index d8cd2cd..064942c 100644
+--- a/source/XMPFiles/FileHandlers/P2_Handler.cpp
++++ b/source/XMPFiles/FileHandlers/P2_Handler.cpp
+@@ -679,11 +679,11 @@ void P2_MetaHandler::SetStartTimecodeFromLegacyXML ( XML_NodePtr legacyVideoCont
+ 
+ 					dmTimeFormat = "50Timecode";
+ 
+-				} else if ( p2FrameRate == "59.94p" ) {
++				} else if ( ( p2FrameRate == "59.94p" ) && ( p2DropFrameFlag != 0 ) ) {
+ 
+-					if ( p2DropFrameFlag == "true" ) {
++					if ( std::strcmp ( p2DropFrameFlag, "true" ) == 0 ) {
+ 						dmTimeFormat = "5994DropTimecode";
+-					} else if ( p2DropFrameFlag == "false" ) {
++					} else if ( std::strcmp ( p2DropFrameFlag, "false") == 0 ) {
+ 						dmTimeFormat = "5994NonDropTimecode";
+ 					}
+ 
diff --git a/exempi.changes b/exempi.changes
index 27c8ed0..4170996 100644
--- a/exempi.changes
+++ b/exempi.changes
@@ -4,6 +4,24 @@ Fri Jan  9 22:23:55 CET 2009 - crrodriguez@suse.de
 - remove static libraries and "la" files
 - correct -devel package deps 
 
+-------------------------------------------------------------------
+Wed Dec 24 13:31:11 EST 2008 - hfiguiere@suse.de
+ 
+- New upstream version 2.1.0
+  + Upgrade XMPCore to Adobe XMP 4.4.2
+  + New: NS_PDF namespace for PDF.
+  + New: API xmp_prefix_namespace_uri() and xmp_namespace_prefix(). fdo#14962.
+  + Bug: make sure boost >1.35 does not fail test with system().
+  + Bug: unit test now use boost/test/minimal.hpp to work with more boost
+    install. (known boost.test bug)
+  + Bug: fix a typo in a CHECK_PTR call causing warnings on gcc < 4.
+  + Bug: no longer define UNIX_ENV in exempi.cpp and let CPPFLAGS do it.
+  + Bug fdo#16139: the list of exported symbols was too large.
+  + Bug fdo#18635: fix crasher.
+- Added patch exempi-rpmlint.diff to make rpmlint happy. fdo#19312
+- Added zlib-devel as a dependency
+- Remove .la and disable static
+
 -------------------------------------------------------------------
 Wed Oct 22 11:23:51 CDT 2008 - maw@suse.de
 
diff --git a/exempi.spec b/exempi.spec
index 28d96a2..875a99f 100644
--- a/exempi.spec
+++ b/exempi.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package exempi (Version 2.0.2)
+# spec file for package exempi (Version 2.1.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,21 +17,24 @@
 
 # norootforbuild
 
-BuildRequires:  boost-devel >= 1.33.0
-BuildRequires:  gcc-c++
-BuildRequires:  libexpat-devel
 
 Name:           exempi
 Url:            http://libopenraw.freedesktop.org/wiki/Exempi
-Version:        2.0.2
-Release:        3
+Version:        2.1.0
+Release:        1
+BuildRequires:  boost-devel >= 1.33.0
+BuildRequires:  gcc-c++
+BuildRequires:  libexpat-devel
+BuildRequires:  zlib-devel
 Summary:        XMP support library
 License:        BSD 3-Clause
 Group:          Development/Libraries/C and C++
 Source0:        http://libopenraw.freedesktop.org/download/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM
+Patch0:         exempi-rpmlint.diff
 AutoReqProv:    on
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%define debug_package_requires libexempi3 = %{version}-%{release}
+%define debug_package_requires libexempi3 = %{version}
 
 %description
 XMP parsing and IO library
@@ -82,10 +85,11 @@ Authors:
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-%configure --disable-static --with-pic
+%configure --disable-static
 %__make %{?jobs:-j%jobs}    
 
 %install
@@ -115,6 +119,21 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Jan 09 2009 crrodriguez@suse.de
 - remove static libraries and "la" files
 - correct -devel package deps
+* Wed Dec 24 2008 hfiguiere@suse.de
+- New upstream version 2.1.0
+  + Upgrade XMPCore to Adobe XMP 4.4.2
+  + New: NS_PDF namespace for PDF.
+  + New: API xmp_prefix_namespace_uri() and xmp_namespace_prefix(). fdo#14962.
+  + Bug: make sure boost >1.35 does not fail test with system().
+  + Bug: unit test now use boost/test/minimal.hpp to work with more boost
+  install. (known boost.test bug)
+  + Bug: fix a typo in a CHECK_PTR call causing warnings on gcc < 4.
+  + Bug: no longer define UNIX_ENV in exempi.cpp and let CPPFLAGS do it.
+  + Bug fdo#16139: the list of exported symbols was too large.
+  + Bug fdo#18635: fix crasher.
+- Added patch exempi-rpmlint.diff to make rpmlint happy. fdo#19312
+- Added zlib-devel as a dependency
+- Remove .la and disable static
 * Wed Oct 22 2008 maw@suse.de
 - Make debug packages require a specific %%{version}-%%{release}.
 * Wed Aug 13 2008 hfiguiere@suse.de