diff --git a/.pytz.metadata b/.pytz.metadata
new file mode 100644
index 0000000..b24526d
--- /dev/null
+++ b/.pytz.metadata
@@ -0,0 +1 @@
+738cff9addf39084e5655558482f865dca2c66dd pytz-2021.1.tar.gz
diff --git a/fix_ftbfs_with_newer_tzdata.patch b/fix_ftbfs_with_newer_tzdata.patch
new file mode 100644
index 0000000..fc45dfe
--- /dev/null
+++ b/fix_ftbfs_with_newer_tzdata.patch
@@ -0,0 +1,50 @@
+From 83155e2f3ecd3e136e1792611afd7faa48eb90f8 Mon Sep 17 00:00:00 2001
+From: Lumir Balhar <lbalhar@redhat.com>
+Date: Thu, 13 Jul 2023 12:05:29 +0200
+Subject: [PATCH] Fix ftbfs with newer tzdata
+
+Newer tzdata contains some corrections of timezones having effect
+on years before 1930.
+---
+ pytz/tests/test_tzinfo.py | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/pytz/tests/test_tzinfo.py b/pytz/tests/test_tzinfo.py
+index dda13b9..e3d5ccc 100644
+--- a/pytz/tests/test_tzinfo.py
++++ b/pytz/tests/test_tzinfo.py
+@@ -617,18 +617,18 @@ class LocalTestCase(unittest.TestCase):
+ 
+         loc_time = loc_tz.localize(datetime(1930, 5, 10, 0, 0, 0))
+         # Actually +00:19:32, but Python datetime rounds this
+-        self.assertEqual(loc_time.strftime('%Z%z'), 'AMT+0020')
++        self.assertEqual(loc_time.strftime('%Z%z'), 'WEST+0100')
+ 
+         loc_time = loc_tz.localize(datetime(1930, 5, 20, 0, 0, 0))
+         # Actually +00:19:32, but Python datetime rounds this
+-        self.assertEqual(loc_time.strftime('%Z%z'), 'NST+0120')
++        self.assertEqual(loc_time.strftime('%Z%z'), 'WEST+0100')
+ 
+         loc_time = loc_tz.localize(datetime(1940, 5, 10, 0, 0, 0))
+         # pre-2017a, abbreviation was NCT
+-        self.assertEqual(loc_time.strftime('%Z%z'), '+0020+0020')
++        self.assertEqual(loc_time.strftime('%Z%z'), 'WEST+0100')
+ 
+         loc_time = loc_tz.localize(datetime(1940, 5, 20, 0, 0, 0))
+-        self.assertEqual(loc_time.strftime('%Z%z'), 'CEST+0200')
++        self.assertEqual(loc_time.strftime('%Z%z'), 'WEST+0100')
+ 
+         loc_time = loc_tz.localize(datetime(2004, 2, 1, 0, 0, 0))
+         self.assertEqual(loc_time.strftime('%Z%z'), 'CET+0100')
+@@ -723,7 +723,7 @@ class LocalTestCase(unittest.TestCase):
+         loc_dt = utc_dt.astimezone(tz)
+         self.assertEqual(
+             loc_dt.strftime('%Y-%m-%d %H:%M:%S %Z%z'),
+-            '1914-01-01 14:00:00 AMT+0020'
++            '1914-01-01 13:40:00 WET+0000'
+         )
+ 
+         # And get back...
+-- 
+2.41.0
+
diff --git a/pytz.spec b/pytz.spec
index cb25d8c..6a39971 100644
--- a/pytz.spec
+++ b/pytz.spec
@@ -12,7 +12,7 @@
 
 Name:           pytz
 Version:        2021.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        World Timezone Definitions for Python
 
 License:        MIT
@@ -22,6 +22,14 @@ Source0:        %pypi_source
 Patch0:         pytz-zoneinfo.patch
 # https://bugzilla.redhat.com/1497572
 Patch1:         remove_tzinfo_test.patch
+# https://bugzilla.redhat.com/2216116
+# https://issues.redhat.com/browse/RHEL-676
+# Upstream: https://github.com/stub42/pytz/commit/07aa4d962dae5cb7ced4f61fe85a9001a01676df
+# Upstream changed the way it includes the tzdata which is something
+# we cannot replicate downstream because we use the databse provided
+# by tzdata component instead of the bundled one so the patch
+# makes the tests pass with the latest version of tzdata.
+Patch2:         fix_ftbfs_with_newer_tzdata.patch
 
 BuildArch:      noarch
 
@@ -107,6 +115,10 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v
 
 
 %changelog
+* Tue Jun 27 2023 Lumír Balhar <lbalhar@redhat.com> - 2021.1-5
+- Fix FTBFS with newest tzdata
+Resolves: RHEL-676
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2021.1-4
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688