diff --git a/.python-markupsafe.metadata b/.python-markupsafe.metadata
index 54e2f5e..2cedf92 100644
--- a/.python-markupsafe.metadata
+++ b/.python-markupsafe.metadata
@@ -1 +1 @@
-cd5c22acf6dd69046d6cb6a3920d84ea66bdf62a SOURCES/MarkupSafe-0.23.tar.gz
+a4485b605b884c34d455f856c22b342b8f9d6d31  SOURCES/MarkupSafe-2.0.0.tar.gz
diff --git a/SPECS/python-markupsafe.spec b/SPECS/python-markupsafe.spec
index 67baae5..4e6bde4 100644
--- a/SPECS/python-markupsafe.spec
+++ b/SPECS/python-markupsafe.spec
@@ -1,55 +1,109 @@
-Name: python-markupsafe
-Version: 0.23
-Release: 19%{?dist}
-Summary: Implements a XML/HTML/XHTML Markup safe string for Python
+Name:           python-markupsafe
+Version:        2.0.0
+Release:        2%{?dist}
+Summary:        Implements a XML/HTML/XHTML Markup safe string for Python
+License:        BSD
+URL:            https://pypi.org/project/MarkupSafe/
+Source0:        %pypi_source MarkupSafe
 
-Group: Development/Languages
-License: BSD
-URL: http://pypi.python.org/pypi/MarkupSafe
-Source0: http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-%{version}.tar.gz
-
-BuildRequires: python3-devel python3-setuptools
+BuildRequires:  gcc
 
 %description
 A library for safe markup escaping.
 
+
 %package -n python3-markupsafe
-Summary: Implements a XML/HTML/XHTML Markup safe string for Python 3
-Group: Development/Languages
+Summary:        Implements a XML/HTML/XHTML Markup safe string for Python 3
+BuildRequires:  python3-devel
+BuildRequires:  python3dist(setuptools)
+# Test dependencies
+BuildRequires:  python3dist(pytest)
 %{?python_provide:%python_provide python3-markupsafe}
 
 %description -n python3-markupsafe
-A library for safe markup escaping.
+A library for safe markup escaping. Python 3 version.
+
 
 %prep
-%setup -q -n MarkupSafe-%{version}
+%autosetup -n MarkupSafe-%{version}
+
 
 %build
 %py3_build
 
+
 %install
 %py3_install
 # C code errantly gets installed
-rm $RPM_BUILD_ROOT/%{python3_sitearch}/markupsafe/*.c
+rm %{buildroot}%{python3_sitearch}/markupsafe/*.c
 
 
 %check
-%{__python3} setup.py test
+%pytest
 
 
 %files -n python3-markupsafe
-%license LICENSE
-%doc AUTHORS README.rst
-%{python3_sitearch}/*
+%license LICENSE.rst
+%doc CHANGES.rst README.rst
+%{python3_sitearch}/MarkupSafe-%{version}-py%{python3_version}.egg-info/
+%{python3_sitearch}/markupsafe/
 
 
 %changelog
-* Wed Jul 11 2018 Petr Viktorin <pviktori@redhat.com> - 0.23-19
-- Remove the Python 2 subpackage
-  https://bugzilla.redhat.com/show_bug.cgi?id=1590415
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jun 22 2021 Lumír Balhar <lbalhar@redhat.com> - 2.0.0-1
+- Update to 2.0.0
+Resolves: rhbz#1823024
+
+* Wed Jun 02 2021 Python Maint <python-maint@redhat.com> - 1.1.1-11
+- Rebuilt for Python 3.10
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Dec 21 2020 Miro Hrončok <mhroncok@redhat.com> - 1.1.1-9
+- Disable Python 2 entirely
+
+* Wed Nov 25 2020 Miro Hrončok <mhroncok@redhat.com> - 1.1.1-8
+- Disable Python 2 in ELN
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1.1.1-6
+- Rebuilt for Python 3.9
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.1-4
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.1-3
+- Rebuilt for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Feb 27 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.1-1
+- Update to 1.1.1 (#1680333)
+
+* Mon Feb 18 2019 Yatin Karel <ykarel@redhat.com> - 1.1.0-1
+- Update to 1.1.0
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jul 31 2018 Miro Hrončok <mhroncok@redhat.com> - 1.0-1
+- Update to 1.0 (#1430160)
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
-* Mon Jun 25 2018 Lumír Balhar <lbalhar@redhat.com> - 0.23-18
-- Allow build with Python 2
+* Thu Jun 14 2018 Miro Hrončok <mhroncok@redhat.com> - 0.23-18
+- Rebuilt for Python 3.7
 
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.23-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild