diff --git a/.gitignore b/.gitignore
index 15d8049..19c0247 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ exempi-2.1.1.tar.gz
 /exempi-2.4.5.tar.bz2
 /exempi-2.5.1.tar.bz2
 /exempi-2062d44dadbc603524ed0ffdb752070455b7e7fa.tar.bz2
+/exempi-e23c21380f467f1f1c9dc397e0a08405fb4afa7a.tar.bz2
diff --git a/exempi-e23c213-typeinfos.patch b/exempi-e23c213-typeinfos.patch
new file mode 100644
index 0000000..0e05bf3
--- /dev/null
+++ b/exempi-e23c213-typeinfos.patch
@@ -0,0 +1,27 @@
+From d45c06270576493e1537080fa43c1af667c4337a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
+Date: Tue, 12 Oct 2021 14:15:17 +0200
+Subject: [PATCH] Avoid multiple definitions of typeinfos
+
+---
+ XMPFiles/source/XMPFiles_Impl.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/XMPFiles/source/XMPFiles_Impl.cpp b/XMPFiles/source/XMPFiles_Impl.cpp
+index 2f918ac..ff45040 100644
+--- a/XMPFiles/source/XMPFiles_Impl.cpp
++++ b/XMPFiles/source/XMPFiles_Impl.cpp
+@@ -47,7 +47,9 @@ using namespace std;
+ /// This file ...
+ ///
+ // =================================================================================================
+-#include "public/include/XMP.incl_cpp"
++#if ! XMP_StaticBuild
++	#include "public/include/XMP.incl_cpp"
++#endif
+ 
+ #if XMP_WinBuild
+ 	#pragma warning ( disable : 4290 )	// C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
+-- 
+2.33.0
+
diff --git a/exempi.spec b/exempi.spec
index 9c66cd0..7eac757 100644
--- a/exempi.spec
+++ b/exempi.spec
@@ -1,15 +1,15 @@
-%global commit 2062d44dadbc603524ed0ffdb752070455b7e7fa
+%global commit e23c21380f467f1f1c9dc397e0a08405fb4afa7a
 %global shortcommit %%(c=%{commit}; echo ${c:0:7})
-%global date 20210917
+%global date 20211007
 
 Summary:	Library for easy parsing of XMP metadata
 Name:		exempi
-Version:	2.5.3
+Version:	2.6.0
 Release:	0.1.%{date}git%{shortcommit}%{?dist}
 License:	BSD
 URL:		http://libopenraw.freedesktop.org/wiki/Exempi
-# Temporary fork until a new upstream version of exempi is released
-Source0:	https://gitlab.freedesktop.org/nforro/%{name}/-/archive/%{commit}/%{name}-%{commit}.tar.bz2
+Source0:	https://gitlab.freedesktop.org/libopenraw/%{name}/-/archive/%{commit}/%{name}-%{commit}.tar.bz2
+Patch0:		exempi-e23c213-typeinfos.patch
 BuildRequires:	gcc-c++
 BuildRequires:	boost-devel expat-devel zlib-devel pkgconfig
 # Work around for aarch64 support (https://bugzilla.redhat.com/show_bug.cgi?id=925327)
@@ -32,7 +32,7 @@ This package contains the libraries and header files needed for
 developing with exempi.
 
 %prep
-%setup -q -n %{name}-%{commit}
+%autosetup -p1 -n %{name}-%{commit}
 
 %build
 libtoolize -vi
@@ -47,7 +47,13 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 %make_build
 
 %check
+%ifarch s390x
+# testcore test fails on big endian arches since exempi 2.5.2:
+# https://gitlab.freedesktop.org/libopenraw/exempi/-/issues/23
+make check || [ "$(grep '^FAIL:' exempi/test-suite.log)" = "FAIL: tests/testcore" ]
+%else
 make check
+%endif
 
 %install
 %make_install
@@ -67,7 +73,11 @@ rm -rf %{buildroot}%{_libdir}/*.a
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Fri Sep 17 2021 Nikola Forró <nforro@redhat.com> - 2.5.3-0.2.20210917git2062d44
+* Thu Oct 07 2021 Nikola Forró <nforro@redhat.com> - 2.6.0-0.1.20211007gite23c213
+- Update to (unreleased) version 2.6.0 to resolve licensing issues
+  and not to deviate from upstream
+
+* Fri Sep 17 2021 Nikola Forró <nforro@redhat.com> - 2.5.3-0.1.20210917git2062d44
 - Update to (unreleased) version 2.5.3 to resolve licensing issues
 
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.1-7
diff --git a/sources b/sources
index 2067fde..9ee8558 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (exempi-2062d44dadbc603524ed0ffdb752070455b7e7fa.tar.bz2) = 03a35ad07b6ec364af72314ce54be62d6515b60615e5c49349df76bcb9f049181220819924e57a72675acee75ef84d2260f512652c030a14b7811fec721ba1dc
+SHA512 (exempi-e23c21380f467f1f1c9dc397e0a08405fb4afa7a.tar.bz2) = ad7142712c99bec02e1f119293e095b68db99d303f5c21d47b8658cf43b84f2aa48b78dd49565eb80dc1888e8c1bcfb376686ef690f2a052c415180fa1af13d4