diff --git a/.gitignore b/.gitignore
index 271de46..1abeeb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /python-glanceclient-2.0.1.tar.gz
 /python-glanceclient-2.5.0.tar.gz
 /python-glanceclient-2.6.0.tar.gz
+/python-glanceclient-2.8.0.tar.gz
diff --git a/python-glanceclient.spec b/python-glanceclient.spec
index 3b75eaa..ac9b031 100644
--- a/python-glanceclient.spec
+++ b/python-glanceclient.spec
@@ -8,8 +8,8 @@
 
 Name:             python-glanceclient
 Epoch:            1
-Version:          2.6.0
-Release:          2%{?dist}
+Version:          2.8.0
+Release:          1%{?dist}
 Summary:          Python API and CLI for OpenStack Glance
 
 License:          ASL 2.0
@@ -18,6 +18,8 @@ Source0:          https://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.
 
 BuildArch:        noarch
 
+BuildRequires:    git
+
 %description
 This is a client for the OpenStack Glance API. There's a Python API (the
 glanceclient module), and a command-line script (glance). Each implements
@@ -31,14 +33,13 @@ BuildRequires:    python2-devel
 BuildRequires:    python-setuptools
 BuildRequires:    python-pbr
 
-Requires:         python-babel >= 2.3.4
-Requires:         python-keystoneauth1 >= 2.18.0
+Requires:         python-keystoneauth1 >= 3.1.0
 Requires:         python-oslo-i18n >= 2.1.0
-Requires:         python-oslo-utils >= 3.18.0
+Requires:         python-oslo-utils >= 3.20.0
 Requires:         python-pbr
 Requires:         python-prettytable
+Requires:         pyOpenSSL >= 0.14
 Requires:         python-requests
-Requires:         python-setuptools
 Requires:         python-six >= 1.9.0
 Requires:         python-warlock
 Requires:         python-wrapt
@@ -57,17 +58,16 @@ BuildRequires:    python3-devel
 BuildRequires:    python3-setuptools
 BuildRequires:    python3-pbr
 
-Requires:         python3-babel >= 2.3.4
-Requires:         python3-keystoneauth1 >= 2.18.0
+Requires:         python3-keystoneauth1 >= 3.1.0
 Requires:         python3-oslo-i18n >= 2.1.0
-Requires:         python3-oslo-utils >= 3.18.0
+Requires:         python3-oslo-utils >= 3.20.0
 Requires:         python3-pbr
 Requires:         python3-prettytable
+Requires:         python3-pyOpenSSL >= 0.14
 Requires:         python3-requests
-Requires:         python3-setuptools
 Requires:         python3-six >= 1.9.0
 Requires:         python3-warlock
-Requires:         python-wrapt
+Requires:         python3-wrapt
 
 %description -n python3-%{sname}
 This is a client for the OpenStack Glance API. There's a Python API (the
@@ -79,7 +79,12 @@ glanceclient module), and a command-line script (glance). Each implements
 Summary:          Documentation for OpenStack Glance API Client
 
 BuildRequires:    python-sphinx
-BuildRequires:    python-oslo-sphinx
+BuildRequires:    python-openstackdocstheme
+BuildRequires:    python-keystoneauth1
+BuildRequires:    python-oslo-utils
+BuildRequires:    python-prettytable
+BuildRequires:    python-warlock
+BuildRequires:    pyOpenSSL >= 0.14
 
 %description      doc
 This is a client for the OpenStack Glance API. There's a Python API (the
@@ -89,7 +94,7 @@ glanceclient module), and a command-line script (glance). Each implements
 This package contains auto-generated documentation.
 
 %prep
-%setup -q -n %{name}-%{upstream_version}
+%autosetup -n %{name}-%{upstream_version} -S git
 
 rm -rf {,test-}requirements.txt
 
@@ -121,13 +126,11 @@ install -pm 644 tools/glance.bash_completion \
 # Delete tests
 rm -fr %{buildroot}%{python2_sitelib}/glanceclient/tests
 
-
-export PYTHONPATH="$( pwd ):$PYTHONPATH"
-sphinx-build -b html doc/source html
-
+# generate html docs
+%{__python2} setup.py build_sphinx -b html
 # generate man page
-sphinx-build -b man doc/source man
-install -p -D -m 644 man/glance.1 %{buildroot}%{_mandir}/man1/glance.1
+%{__python2} setup.py build_sphinx -b man
+install -p -D -m 644 doc/build/man/glance.1 %{buildroot}%{_mandir}/man1/glance.1
 
 %files -n python2-%{sname}
 %doc README.rst
@@ -153,13 +156,10 @@ install -p -D -m 644 man/glance.1 %{buildroot}%{_mandir}/man1/glance.1
 %endif
 
 %files doc
-%doc html
+%doc doc/build/html
 %license LICENSE
 
 %changelog
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.6.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Wed Feb 08 2017 Alfredo Moralejo <amoralej@redhat.com> 1:2.6.0-1
-- Update to 2.6.0
+* Fri Aug 11 2017 Alfredo Moralejo <amoralej@redhat.com> 1:2.8.0-1
+- Update to 2.8.0
 
diff --git a/sources b/sources
index a0ed8dc..4cb25f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (python-glanceclient-2.6.0.tar.gz) = c566a261a42cc38db0adea507bbca4790ffa850a81bbf98ff01aa8629bb2d80fe9717a2e17b048367974809c7f7d348881397a53bfeafbc7438b73f9b4bc97e0
+SHA512 (python-glanceclient-2.8.0.tar.gz) = 257eaf1d548a3a6277b9c80e8b23b9ae4231586307c43a064754c227f3e3c872451ec0469aca931638ea0f7c9920892878c677b144dc72bad215c38d375a63d3