diff --git a/.gitignore b/.gitignore
index cba86a7..051ccb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /virtualbmc-1.5.0.tar.gz
 /virtualbmc-1.6.0.tar.gz
+/virtualbmc-2.1.0.tar.gz
diff --git a/python-virtualbmc.spec b/python-virtualbmc.spec
index 586472c..15fc119 100644
--- a/python-virtualbmc.spec
+++ b/python-virtualbmc.spec
@@ -1,12 +1,12 @@
 %global srcname virtualbmc
 
 Name: python-%{srcname}
-Version: 1.6.0
-Release: 3%{?dist}
+Version: 2.1.0
+Release: 1%{?dist}
 Summary: A virtual BMC for controlling virtual machines using IPMI commands
 License: ASL 2.0
-URL: https://github.com/openstack/virtualbmc
-Source0: %{pypi_source}
+URL: https://opendev.org/openstack/virtualbmc
+Source0: https://tarballs.opendev.org/openstack/%{srcname}/%{srcname}-%{version}.tar.gz
 Source1: 60-vbmcd.rules
 Source2: vbmcd.service
 BuildArch: noarch
@@ -14,8 +14,10 @@ BuildRequires: python3-devel
 BuildRequires: python3-pbr
 BuildRequires: python3-setuptools
 BuildRequires: systemd-rpm-macros
+BuildRequires: git
 # Documentation
 BuildRequires: python3-sphinx
+BuildRequires: python3-openstackdocstheme
 # Tests
 BuildRequires: python3-stestr
 BuildRequires: python3-libvirt
@@ -50,14 +52,13 @@ Summary: VirtualBMC documentation
 Documentation for VirtualBMC.
 
 %prep
-%autosetup -n %{srcname}-%{version}
+%autosetup -n %{srcname}-%{version} -S git
 
 %build
 %py3_build
-
 # generate html docs
-%{__python3} setup.py build_sphinx -b html
-# remove the sphinx-build leftovers
+sphinx-build-3 -W -b html doc/source doc/build/html
+# remove the sphinx-build-3 leftovers
 rm -rf doc/build/html/.{doctrees,buildinfo}
 
 %install
@@ -102,10 +103,13 @@ exit 0
 
 %files -n python3-%{srcname}-doc
 %license LICENSE
-%doc README.rst HACKING.rst CONTRIBUTING.rst ChangeLog
+%doc AUTHORS README.rst HACKING.rst CONTRIBUTING.rst ChangeLog
 %doc doc/build/html
 
 %changelog
+* Fri Jul 17 2020 Juan Orti Alcaine <jortialc@redhat.com> - 2.1.0-1
+- Version 2.1.0
+
 * Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1.6.0-3
 - Rebuilt for Python 3.9
 
diff --git a/sources b/sources
index 3b62504..d7eab5a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (virtualbmc-1.6.0.tar.gz) = 9c9ec05c43df0a42bc7a5e9d185400dfb56f9b9b793f9174d5ab71fab2d88f2c3729fa48578aa7a4d9808ce5ee60a336f1eb9cc77539ba51eccbddcb3ea85c93
+SHA512 (virtualbmc-2.1.0.tar.gz) = 41236904f5a2597be70c7022573f6da86026323991e7da642b21c19e38cbfb9d3819cce77f1791e72fb109d47e79aa49cd792cd6cf4f0066b8d99b6b1a694c26