diff --git a/.gitignore b/.gitignore
index 27a250e..cc650a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /python-swiftclient-2.6.0.tar.gz
 /python-swiftclient-3.0.0.tar.gz
 /python-swiftclient-3.1.0.tar.gz
+/python-swiftclient-3.4.0.tar.gz
diff --git a/python-swiftclient.spec b/python-swiftclient.spec
index 7b9bd38..881a091 100644
--- a/python-swiftclient.spec
+++ b/python-swiftclient.spec
@@ -7,12 +7,12 @@
 %endif
 
 Name:       python-swiftclient
-Version:    3.1.0
-Release:    6%{?dist}
+Version:    3.4.0
+Release:    1%{?dist}
 Summary:    Client Library for OpenStack Object Storage API
 License:    ASL 2.0
 URL:        http://launchpad.net/python-swiftclient/
-Source0:    http://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz
+Source0:    https://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz
 
 BuildArch:  noarch
 
@@ -60,7 +60,7 @@ Summary:    Documentation for OpenStack Object Storage API Client
 Group:      Documentation
 
 BuildRequires: python-sphinx
-BuildRequires: python-oslo-sphinx >= 4.9.0
+BuildRequires: python-oslo-sphinx
 BuildRequires: python-futures
 
 %description doc
@@ -97,12 +97,11 @@ ln -s ./swift-2 %{buildroot}%{_bindir}/swift
 # Delete tests
 rm -fr %{buildroot}%{python2_sitelib}/swiftclient/tests
 
+%{__python2} setup.py build_sphinx -b html
+rm -rf doc/build/html/.{doctrees,buildinfo}
 
-export PYTHONPATH="$( pwd ):$PYTHONPATH"
-sphinx-build -b html doc/source html
-sphinx-build -b man doc/source man
-
-install -p -D -m 644 doc/manpages/swift.1 %{buildroot}%{_mandir}/man1/swift.1
+%{__python2} setup.py build_sphinx -b man
+install -p -D -m 644 doc/build/man/*.1 %{buildroot}%{_mandir}/man1/
 
 %files -n python2-%{sname}
 %doc README.rst
@@ -112,7 +111,7 @@ install -p -D -m 644 doc/manpages/swift.1 %{buildroot}%{_mandir}/man1/swift.1
 %{_bindir}/swift
 %{_bindir}/swift-2
 %{_bindir}/swift-%{python2_version}
-%{_mandir}/man1/swift.1.gz
+%{_mandir}/man1/*
 
 %if 0%{?with_python3}
 %files -n python3-%{sname}
@@ -125,25 +124,10 @@ install -p -D -m 644 doc/manpages/swift.1 %{buildroot}%{_mandir}/man1/swift.1
 %endif
 
 %files doc
-%doc html
+%doc doc/build/html
 %license LICENSE
 
 %changelog
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Jan 11 2017 Pete Zaitcev <zaitcev@redhat.com> - 3.1.0-4
-- Rebuild without workarounds for oslosphinx
-
-* Fri Dec 30 2016 Pete Zaitcev <zaitcev@redhat.com> - 3.1.0-3
-- Actually rebuild, with a temporary patch for oslosphinx 4.3.0 (see #1408503)
-
-* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 3.1.0-2
-- Rebuild for Python 3.6
-
-* Sun Sep 11 2016 Haikel Guemar <hguemar@fedoraproject.org> 3.1.0-1
-- Update to 3.1.0
+* Fri Aug 11 2017 Alfredo Moralejo <amoralej@redhat.com> 3.4.0-1
+- Update to 3.4.0
 
diff --git a/sources b/sources
index bd79d69..e1c915a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec4662569de59f6965a1b6703fe62449  python-swiftclient-3.1.0.tar.gz
+SHA512 (python-swiftclient-3.4.0.tar.gz) = c7def24f22ced03316ccb74fcd7426b071597a3c7576c14f98fd6d864d6ee3e8a7666966ca2d07b6d996546bfcc2497ab654a67ab0228705f078985a35b97457