diff --git a/.gitignore b/.gitignore
index eb7dbf5..c2b84aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /oslo.config-4.11.1.tar.gz
 /oslo.config-5.2.0.tar.gz
 /oslo.config-6.8.1.tar.gz
+/oslo.config-6.11.1.tar.gz
diff --git a/python-oslo-config.spec b/python-oslo-config.spec
index bef78a2..7756327 100644
--- a/python-oslo-config.spec
+++ b/python-oslo-config.spec
@@ -1,16 +1,26 @@
+# 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 %python%{pyver}_sitelib
+%global pyver_install %py%{pyver}_install
+%global pyver_build %py%{pyver}_build
+# End of macros for py2/py3 compatibility
 %global sname oslo.config
 %global pypi_name oslo-config
 %global with_doc 1
-# Bootstrapping stein
+# Needed for train bootstrap
 %global repo_bootstrap 1
 
-
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
 
 Name:       python-oslo-config
 Epoch:      2
-Version:    6.8.1
-Release:    5%{?dist}
+Version:    6.11.1
+Release:    2%{?dist}
 Summary:    OpenStack common configuration library
 
 Group:      Development/Languages
@@ -31,55 +41,54 @@ useful.
 The oslo-config library is a command line and configuration file
 parsing library from the Oslo project.
 
-%if 0%{?with_doc}
-%package -n python-%{pypi_name}-doc
-Summary:    Documentation for OpenStack common configuration library
-BuildRequires: python3-sphinx
-BuildRequires: python3-openstackdocstheme
-BuildRequires: python3-sphinx
-Obsoletes:     python2-%{pypi_name}-doc < 2:6.8.1-2
-%description -n python-%{pypi_name}-doc
-Documentation for the oslo-config library.
+%package -n python%{pyver}-%{pypi_name}
+Summary:    OpenStack common configuration library
+%{?python_provide:%python_provide python%{pyver}-%{pypi_name}}
+%if %{pyver} == 3
+Obsoletes: python2-%{pypi_name} < %{version}-%{release}
 %endif
 
-%package -n python3-%{pypi_name}
-Summary:    OpenStack common configuration library
-%{?python_provide:%python_provide python3-%{pypi_name}}
-
-Requires:   python3-netaddr >= 0.7.18
-Requires:   python3-oslo-i18n >= 3.15.3
-Requires:   python3-rfc3986 >= 1.2.0
-Requires:   python3-pbr
-Requires:   python3-requests >= 2.18.0
-Requires:   python3-six >= 1.10.0
-Requires:   python3-stevedore >= 1.20.0
-Requires:   python3-debtcollector >= 1.2.0
-Requires:   python3-PyYAML >= 3.10
-
-BuildRequires: python3-devel
-BuildRequires: python3-oslo-i18n
-BuildRequires: python3-rfc3986
-BuildRequires: python3-pbr
-BuildRequires: python3-setuptools
+Requires:   python%{pyver}-oslo-i18n >= 3.15.3
+Requires:   python%{pyver}-rfc3986 >= 1.2.0
+Requires:   python%{pyver}-pbr
+Requires:   python%{pyver}-requests >= 2.18.0
+Requires:   python%{pyver}-six >= 1.10.0
+Requires:   python%{pyver}-stevedore >= 1.20.0
+Requires:   python%{pyver}-debtcollector >= 1.2.0
+Requires:   python%{pyver}-netaddr >= 0.7.18
+%if %{pyver} == 2
+Requires:   python-enum34
+Requires:   PyYAML >= 3.10
+%else
+Requires:   python%{pyver}-PyYAML >= 3.10
+%endif
+
+BuildRequires: python%{pyver}-devel
+BuildRequires: python%{pyver}-setuptools
+BuildRequires: python%{pyver}-oslo-i18n
+BuildRequires: python%{pyver}-rfc3986
+BuildRequires: python%{pyver}-pbr
 BuildRequires: git
 # Required for tests
-BuildRequires: python3-fixtures
-BuildRequires: python3-netaddr
-BuildRequires: python3-oslotest >= 1.10.0
-BuildRequires: python3-six >= 1.10.0
-BuildRequires: python3-stevedore
-BuildRequires: python3-PyYAML
-BuildRequires: python3-testscenarios
-BuildRequires: python3-testrepository
-BuildRequires: python3-testtools
-BuildRequires: python3-oslotest
-BuildRequires: python3-requests-mock
+BuildRequires: python%{pyver}-testscenarios
+BuildRequires: python%{pyver}-stestr
+BuildRequires: python%{pyver}-testtools
+BuildRequires: python%{pyver}-oslotest
+BuildRequires: python%{pyver}-requests-mock
+BuildRequires: python%{pyver}-netaddr
+BuildRequires: python%{pyver}-stevedore
+%if %{pyver} == 2
+BuildRequires: python-enum34
+BuildRequires: PyYAML
+%else
+BuildRequires: python%{pyver}-PyYAML
+%endif
 
 %if 0%{?repo_bootstrap} == 0
-BuildRequires: python3-oslo-log
+BuildRequires: python%{pyver}-oslo-log
 %endif
 
-%description -n python3-%{pypi_name}
+%description -n python%{pyver}-%{pypi_name}
 The Oslo project intends to produce a python library containing
 infrastructure code shared by OpenStack projects. The APIs provided
 by the project should be high quality, stable, consistent and generally
@@ -88,6 +97,21 @@ useful.
 The oslo-config library is a command line and configuration file
 parsing library from the Oslo project.
 
+%if 0%{?with_doc}
+%package -n python-%{pypi_name}-doc
+Summary:    Documentation for OpenStack common configuration library
+
+BuildRequires: python%{pyver}-sphinx
+BuildRequires: python%{pyver}-fixtures
+BuildRequires: python%{pyver}-openstackdocstheme
+BuildRequires: python%{pyver}-oslotest >= 1.10.0
+BuildRequires: python%{pyver}-stevedore
+BuildRequires: python%{pyver}-sphinxcontrib-apidoc
+
+%description -n python-%{pypi_name}-doc
+Documentation for the oslo-config library.
+%endif
+
 %prep
 %autosetup -n %{sname}-%{upstream_version} -S git
 # Remove shebang from non executable file, it's used by the oslo-config-validator binary.
@@ -102,52 +126,49 @@ rm oslo_config/tests/test_sphinxconfiggen.py
 %endif
 
 %build
-%py3_build
+%{pyver_build}
 
 %if 0%{?with_doc}
 export PYTHONPATH=.
-sphinx-build-3 -b html doc/source doc/build/html
-# remove the sphinx-build-3 leftovers
+sphinx-build-%{pyver} -b html doc/source doc/build/html
+# remove the sphinx-build-%{pyver} leftovers
 rm -rf doc/build/html/.{doctrees,buildinfo}
 %endif
 
 %install
-%py3_install
+%{pyver_install}
 pushd %{buildroot}/%{_bindir}
 for i in generator validator
 do
-mv oslo-config-$i oslo-config-$i-%{python3_version}
-ln -s oslo-config-$i-%{python3_version} oslo-config-$i-3
-ln -s oslo-config-$i-%{python3_version} oslo-config-$i
+ln -s oslo-config-$i oslo-config-$i-%{pyver}
 done
-# Let's keep backwards compatibility for some time
-ln -s oslo-config-generator-%{python3_version} python3-oslo-config-generator
 popd
 
 %check
 %if 0%{?repo_bootstrap} == 0
-rm -rf .testrepository
-PYTHON=python3 %{__python3} setup.py test
+PYTHON=%{pyver_bin} stestr-%{pyver} run
 %endif
 
+%files -n python%{pyver}-%{pypi_name}
+%doc README.rst
+%license LICENSE
+%{_bindir}/oslo-config-generator
+%{_bindir}/oslo-config-generator-%{pyver}
+%{_bindir}/oslo-config-validator
+%{_bindir}/oslo-config-validator-%{pyver}
+%{pyver_sitelib}/oslo_config
+%{pyver_sitelib}/*.egg-info
+
 %if 0%{?with_doc}
 %files -n python-%{pypi_name}-doc
 %doc doc/build/html
 %license LICENSE
 %endif
 
-%files -n python3-%{pypi_name}
-%doc README.rst
-%license LICENSE
-%{_bindir}/oslo-config-generator-3*
-%{_bindir}/oslo-config-generator
-%{_bindir}/python3-oslo-config-generator
-%{_bindir}/oslo-config-validator-3*
-%{_bindir}/oslo-config-validator
-%{python3_sitelib}/oslo_config
-%{python3_sitelib}/*.egg-info
-
 %changelog
+* Wed Nov 06 2019 Alfredo Moralejo <amoralej@redhat.com> 2:6.11.1-2
+- Update to upstream version 6.11.1
+
 * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 2:6.8.1-5
 - Rebuilt for Python 3.8.0rc1 (#1748018)
 
diff --git a/sources b/sources
index 2ed58e6..c86e59c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (oslo.config-6.8.1.tar.gz) = d861120e35332411e7caba1ce1b37a2ad16d986ff2063d731edfa0cd6603000fd7f1abf6ebb611c7efbb6d3c4296c0ffb9ccea2c2cd6ba6bf7b18c53daa09f15
+SHA512 (oslo.config-6.11.1.tar.gz) = 3cadae6c0b2409e18d9c0a72e0c5bbacc22963a7e1804c09c78126e63f49876f0b15d4f2ea16e5f8a38079b2b2fd1b8760b1de217cbc66d93017aa9db169f23c