diff --git a/.gitignore b/.gitignore
index 29d0246..eb7dbf5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
 /oslo.config-3.22.0.tar.gz
 /oslo.config-4.11.1.tar.gz
 /oslo.config-5.2.0.tar.gz
+/oslo.config-6.8.1.tar.gz
diff --git a/python-oslo-config.spec b/python-oslo-config.spec
index 4e68a34..f4ad35b 100644
--- a/python-oslo-config.spec
+++ b/python-oslo-config.spec
@@ -1,14 +1,19 @@
 %global sname oslo.config
 %global pypi_name oslo-config
+%global with_doc 1
+# Bootstrapping stein
+%global repo_bootstrap 1
+
 
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
 
 Name:       python-oslo-config
 Epoch:      2
-Version:    5.2.0
-Release:    5%{?dist}
+Version:    6.8.1
+Release:    1%{?dist}
 Summary:    OpenStack common configuration library
 
+Group:      Development/Languages
 License:    ASL 2.0
 URL:        https://launchpad.net/%{sname}
 Source0:    https://tarballs.openstack.org/%{sname}/%{sname}-%{upstream_version}.tar.gz
@@ -26,29 +31,26 @@ useful.
 The oslo-config library is a command line and configuration file
 parsing library from the Oslo project.
 
-%package -n python-%{pypi_name}-doc
+%if 0%{?with_doc}
+%package -n python2-%{pypi_name}-doc
 Summary:    Documentation for OpenStack common configuration library
-
-BuildRequires: python3-fixtures
+%{?python_provide:%python_provide python2-%{pypi_name}-doc}
+BuildRequires: python3-sphinx
 BuildRequires: python3-openstackdocstheme
-BuildRequires: python3-oslotest >= 1.10.0
 BuildRequires: python3-sphinx
-BuildRequires: python3-stevedore
-BuildRequires: python3-netaddr
-BuildRequires: python3-pyyaml
-
-%description -n python-%{pypi_name}-doc
+%description -n python2-%{pypi_name}-doc
 Documentation for the oslo-config library.
+%endif
 
 %package -n python3-%{pypi_name}
 Summary:    OpenStack common configuration library
 %{?python_provide:%python_provide python3-%{pypi_name}}
-Obsoletes: python2-%{pypi_name} < %{version}-%{release}
 
 Requires:   python3-netaddr >= 0.7.18
 Requires:   python3-oslo-i18n >= 3.15.3
-Requires:   python3-rfc3986 >= 0.3.1
+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
@@ -63,11 +65,19 @@ BuildRequires: git
 # Required for tests
 BuildRequires: python3-fixtures
 BuildRequires: python3-netaddr
-BuildRequires: python3-openstackdocstheme
 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
+
+%if 0%{?repo_bootstrap} == 0
+BuildRequires: python3-oslo-log
+%endif
 
 %description -n python3-%{pypi_name}
 The Oslo project intends to produce a python library containing
@@ -80,47 +90,64 @@ parsing library from the Oslo project.
 
 %prep
 %autosetup -n %{sname}-%{upstream_version} -S git
-
+# Remove shebang from non executable file, it's used by the oslo-config-validator binary.
+sed -i '/\/usr\/bin\/env/d' oslo_config/validator.py
 # let RPM handle deps
 rm -rf {test-,}requirements.txt
 
-%build
-%{__python3} setup.py build
+# Remove tests requiring sphinx if sphinx is not available
+%if 0%{?with_doc} == 0
+rm oslo_config/tests/test_sphinxext.py
+rm oslo_config/tests/test_sphinxconfiggen.py
+%endif
 
-%install
-%{__python3} setup.py install -O1 --skip-build --root %{buildroot}
+%build
+%py3_build
 
-%{__python3} setup.py build_sphinx -b html
-# remove the sphinx-build leftovers
+%if 0%{?with_doc}
+export PYTHONPATH=.
+sphinx-build-3 -b html doc/source doc/build/html
+# remove the sphinx-build-3 leftovers
 rm -rf doc/build/html/.{doctrees,buildinfo}
+%endif
+
+%install
+%py3_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
+done
+# Let's keep backwards compatibility for some time
+ln -s oslo-config-generator-%{python3_version} python3-oslo-config-generator
+popd
 
 %check
-%{__python3} setup.py test || :
+%if 0%{?repo_bootstrap} == 0
+rm -rf .testrepository
+PYTHON=python3 %{__python3} setup.py test
+%endif
 
-%files -n python-%{pypi_name}-doc
+%if 0%{?with_doc}
+%files -n python2-%{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
-* Fri Feb 15 2019 Yatin Karel <ykarel@redhat.com> - 2:5.2.0-5
-- Drop python2 sub package
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2:5.2.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2:5.2.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 2:5.2.0-2
-- Rebuilt for Python 3.7
-
-* Sat Feb 10 2018 RDO <dev@lists.rdoproject.org> 2:5.2.0-1
-- Update to 5.2.0
+* Fri Mar 08 2019 RDO <dev@lists.rdoproject.org> 2:6.8.1-1
+- Update to 6.8.1
 
diff --git a/sources b/sources
index 7bcc740..2ed58e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (oslo.config-5.2.0.tar.gz) = fa3323926f7f7b1a79e4823dfc102027cb466728500980d9f079c2098c93006b4fdeebb2f09bda41512dc854f5dfe080b727fa2d63910e6fc609d69fab87596c
+SHA512 (oslo.config-6.8.1.tar.gz) = d861120e35332411e7caba1ce1b37a2ad16d986ff2063d731edfa0cd6603000fd7f1abf6ebb611c7efbb6d3c4296c0ffb9ccea2c2cd6ba6bf7b18c53daa09f15