diff --git a/.gitignore b/.gitignore
index 91601cb..c8f9c1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 /oslo.i18n-3.19.0.tar.gz
 /oslo.i18n-3.23.1.tar.gz
 /oslo.i18n-3.24.0.tar.gz
+/oslo.i18n-4.0.1.tar.gz
diff --git a/python-oslo-i18n.spec b/python-oslo-i18n.spec
index b85f4cd..74ce115 100644
--- a/python-oslo-i18n.spec
+++ b/python-oslo-i18n.spec
@@ -1,14 +1,3 @@
-# Macros for py2/py3 compatibility
-%if 0%{?fedora} || 0%{?rhel} > 7
-%global pyver %{python3_pkgversion}
-%else
-%global pyver 2
-%endif
-%global pyver_bin python%{pyver}
-%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
-%global pyver_install %{expand:%{py%{pyver}_install}}
-%global pyver_build %{expand:%{py%{pyver}_build}}
-# End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
 
 %global pypi_name oslo.i18n
@@ -21,8 +10,8 @@ The oslo.i18n library contain utilities for working with internationalization \
 or library.
 
 Name:           python-oslo-i18n
-Version:        3.24.0
-Release:        4%{?dist}
+Version:        4.0.1
+Release:        1%{?dist}
 Summary:        OpenStack i18n library
 License:        ASL 2.0
 URL:            https://github.com/openstack/%{pypi_name}
@@ -35,32 +24,33 @@ BuildRequires:  git
 %description
 %{common_desc}
 
-%package -n python%{pyver}-%{pkg_name}
+%package -n python3-%{pkg_name}
 Summary:        OpenStack i18n Python 2 library
-%{?python_provide:%python_provide python%{pyver}-%{pkg_name}}
-
-BuildRequires:  python%{pyver}-devel
-BuildRequires:  python%{pyver}-setuptools
-BuildRequires:  python%{pyver}-pbr
-BuildRequires:  python%{pyver}-babel
-BuildRequires:  python%{pyver}-six
-BuildRequires:  python%{pyver}-fixtures
+%{?python_provide:%python_provide python3-%{pkg_name}}
+
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-pbr
+BuildRequires:  python3-babel
+BuildRequires:  python3-six
+BuildRequires:  python3-fixtures
 # Required to compile translation files
-BuildRequires:  python%{pyver}-babel
+BuildRequires:  python3-babel
 
-Requires:       python%{pyver}-babel
-Requires:       python%{pyver}-six
+Requires:       python3-babel
+Requires:       python3-six
 Requires:       python-%{pkg_name}-lang = %{version}-%{release}
 
-%description -n python%{pyver}-%{pkg_name}
+%description -n python3-%{pkg_name}
 %{common_desc}
 
 %if 0%{?with_doc}
 %package -n python-%{pkg_name}-doc
 Summary:        Documentation for OpenStack i18n library
 
-BuildRequires:  python%{pyver}-sphinx
-BuildRequires:  python%{pyver}-openstackdocstheme
+BuildRequires:  python3-sphinx
+BuildRequires:  python3-openstackdocstheme
+BuildRequires:  python3-sphinxcontrib-apidoc
 
 %description -n python-%{pkg_name}-doc
 Documentation for the oslo.i18n library.
@@ -80,17 +70,17 @@ rm -rf *.egg-info
 rm -rf *requirements.txt
 
 %build
-%{pyver_build}
+%{py3_build}
 
 # Generate i18n files
-%{pyver_bin} setup.py compile_catalog -d build/lib/oslo_i18n/locale
+python3 setup.py compile_catalog -d build/lib/oslo_i18n/locale
 
 %install
-%{pyver_install}
+%{py3_install}
 
 %if 0%{?with_doc}
-%{pyver_bin} setup.py build_sphinx --build-dir . -b html
-# remove the sphinx-build-%{pyver} leftovers
+python3 setup.py build_sphinx --build-dir . -b html
+# remove the sphinx-build-3 leftovers
 rm -rf html/.{doctrees,buildinfo}
 
 # Fix this rpmlint warning
@@ -99,18 +89,18 @@ sed -i "s|\r||g" html/_static/jquery.js
 
 # Install i18n .mo files (.po and .pot are not required)
 install -d -m 755 %{buildroot}%{_datadir}
-rm -f %{buildroot}%{pyver_sitelib}/oslo_i18n/locale/*/LC_*/oslo_i18n*po
-rm -f %{buildroot}%{pyver_sitelib}/oslo_i18n/locale/*pot
-mv %{buildroot}%{pyver_sitelib}/oslo_i18n/locale %{buildroot}%{_datadir}/locale
+rm -f %{buildroot}%{python3_sitelib}/oslo_i18n/locale/*/LC_*/oslo_i18n*po
+rm -f %{buildroot}%{python3_sitelib}/oslo_i18n/locale/*pot
+mv %{buildroot}%{python3_sitelib}/oslo_i18n/locale %{buildroot}%{_datadir}/locale
 
 # Find language files
 %find_lang oslo_i18n --all-name
 
-%files -n python%{pyver}-%{pkg_name}
+%files -n python3-%{pkg_name}
 %doc ChangeLog CONTRIBUTING.rst PKG-INFO README.rst
 %license LICENSE
-%{pyver_sitelib}/oslo_i18n
-%{pyver_sitelib}/*.egg-info
+%{python3_sitelib}/oslo_i18n
+%{python3_sitelib}/*.egg-info
 
 %if 0%{?with_doc}
 %files -n python-%{pkg_name}-doc
@@ -122,6 +112,9 @@ mv %{buildroot}%{pyver_sitelib}/oslo_i18n/locale %{buildroot}%{_datadir}/locale
 %license LICENSE
 
 %changelog
+* Wed Jun 03 2020 Joel Capitao <jcapitao@redhat.com> 4.0.1-1
+- Update to upstream version 4.0.1
+
 * Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.24.0-4
 - Rebuilt for Python 3.9
 
diff --git a/sources b/sources
index c88a4f8..4a3aa77 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (oslo.i18n-3.24.0.tar.gz) = 0891612e19af62a967a7fd7e504f68870011c03fec0be89e9456d64504eb86ace762e10bd187aa860dc883f171e7672d8c8f75e8ae5713f9d7a407dc9009a19f
+SHA512 (oslo.i18n-4.0.1.tar.gz) = 32604150ec97cecf5f1c5befe1544201db01855b88771c88ac63ec998fcefff878ffaecae12931b4d1b6ebcb1dd56b96fb29658e7d44d22686cd8735e3916c3c