diff --git a/.gitignore b/.gitignore
index dc541bf..3a63ff1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /productmd-1.20.tar.bz2
 /productmd-1.21.tar.bz2
 /productmd-1.22.tar.bz2
+/productmd-1.23.tar.bz2
diff --git a/139.patch b/139.patch
new file mode 100644
index 0000000..43b79bd
--- /dev/null
+++ b/139.patch
@@ -0,0 +1,75 @@
+From b091abdc917c2eca544e5928b85b2bb9270912b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
+Date: Thu, 31 Oct 2019 14:25:18 +0100
+Subject: [PATCH] Make tests pass on Python 2.6
+
+---
+ tests/test_extra_files.py | 43 ++++++++++++++++++++++++++++++---------
+ 1 file changed, 33 insertions(+), 10 deletions(-)
+
+diff --git a/tests/test_extra_files.py b/tests/test_extra_files.py
+index 54115e9..7848fd9 100755
+--- a/tests/test_extra_files.py
++++ b/tests/test_extra_files.py
+@@ -63,28 +63,51 @@ def _test_identity(self, modules):
+ 
+     def test_bad_checksums(self):
+         metadata = ExtraFiles()
+-        with self.assertRaises(TypeError):
+-            metadata.add("Everything", "x86_64", "path/to/file", size=1, checksums="no")
++        self.assertRaises(
++            TypeError,
++            metadata.add,
++            "Everything",
++            "x86_64",
++            "path/to/file",
++            size=1,
++            checksums="no",
++        )
+ 
+     def test_bad_variant(self):
+         metadata = ExtraFiles()
+-        with self.assertRaises(ValueError):
+-            metadata.add("", "x86_64", "path/to/file", size=1, checksums={})
++        self.assertRaises(
++            ValueError, metadata.add, "", "x86_64", "path/to/file", size=1, checksums={}
++        )
+ 
+     def test_bad_arch(self):
+         metadata = ExtraFiles()
+-        with self.assertRaises(ValueError):
+-            metadata.add("Everything", "foobar", "path/to/file", size=1, checksums={})
++        self.assertRaises(
++            ValueError,
++            metadata.add,
++            "Everything",
++            "foobar",
++            "path/to/file",
++            size=1,
++            checksums={},
++        )
+ 
+     def test_bad_path(self):
+         metadata = ExtraFiles()
+-        with self.assertRaises(ValueError):
+-            metadata.add("Everything", "foobar", "", size=1, checksums={})
++        self.assertRaises(
++            ValueError, metadata.add, "Everything", "foobar", "", size=1, checksums={}
++        )
+ 
+     def test_absolute_path(self):
+         metadata = ExtraFiles()
+-        with self.assertRaises(ValueError):
+-            metadata.add("Everything", "foobar", "/path", size=1, checksums={})
++        self.assertRaises(
++            ValueError,
++            metadata.add,
++            "Everything",
++            "foobar",
++            "/path",
++            size=1,
++            checksums={},
++        )
+ 
+     def test_fedora_20(self):
+         metadata = ExtraFiles()
diff --git a/python-productmd.spec b/python-productmd.spec
index ff82ed5..afc66b9 100644
--- a/python-productmd.spec
+++ b/python-productmd.spec
@@ -8,13 +8,14 @@
 %global srcname productmd
 
 Name:           python-%{srcname}
-Version:        1.22
+Version:        1.23
 Release:        1%{?dist}
 Summary:        Library providing parsers for metadata related to OS installation
 
 License:        LGPLv2+
 URL:            https://github.com/release-engineering/productmd
 Source0:        https://files.pythonhosted.org/packages/source/p/%{srcname}/%{srcname}-%{version}.tar.bz2
+Patch0:         https://github.com/release-engineering/productmd/pull/139.patch
 
 BuildArch:      noarch
 
@@ -56,7 +57,7 @@ Requires:       python%{python3_pkgversion}-six
 %endif
 
 %prep
-%setup -q -n %{srcname}-%{version}
+%autosetup -n %{srcname}-%{version} -p1
 
 %build
 %if 0%{?with_python2}
@@ -102,6 +103,10 @@ Requires:       python%{python3_pkgversion}-six
 %endif
 
 %changelog
+* Fri Nov 01 2019 Lubomír Sedlář <lsedlar@redhat.com> - 1.23-1
+- Add class for representing extra files in the compose (lsedlar@redhat.com)
+- Add tests for multiple variants in one .treeinfo (riehecky@fnal.gov)
+
 * Wed Sep 04 2019 Lubomír Sedlář <lsedlar@redhat.com> - 1.22-1
 - Fix parsing composeinfo with almost conflicting UIDs (lsedlar@redhat.com)
 - Improve error message for invalid metadata (lsedlar@redhat.com)
diff --git a/sources b/sources
index 6173711..4fbb65d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (productmd-1.22.tar.bz2) = 77336c04c46dddbd5f8814c3ae8cbe23f90e920d01ccf2b5faf7e25025469b6cef966f80230cdfb33902f02049bf5a4be77b2ad31d35350076de607f9b032615
+SHA512 (productmd-1.23.tar.bz2) = 95e02bf274161e1f793f111ac8ffb2d6d12be2b6d948d7182ab2bc552216329e4745958e44f2dcbc22c4042d73d511098056b0e4f7c836b3c3a16320d79664b7