diff --git a/python-cinderclient-3.3.0.tar.gz b/python-cinderclient-3.3.0.tar.gz
deleted file mode 100644
index e96f5ab..0000000
--- a/python-cinderclient-3.3.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c1cec5c5e9adc50826d2e6988e798842d016793fb47a463ab83377cae1c23185
-size 281376
diff --git a/python-cinderclient-3.4.0.tar.gz b/python-cinderclient-3.4.0.tar.gz
new file mode 100644
index 0000000..081d461
--- /dev/null
+++ b/python-cinderclient-3.4.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f3ae075f5e9d00290880831272fba2808bfe09f76cce803cb490a393ec2218c6
+size 283002
diff --git a/python-cinderclient.changes b/python-cinderclient.changes
index 711da51..d8feb5d 100644
--- a/python-cinderclient.changes
+++ b/python-cinderclient.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Jan 16 22:00:53 UTC 2018 - cloud-devel@suse.de
+
+- update to version 3.4.0
+  - Remove 'end_version' parameter in backup update
+  - Remove setting of version/release from releasenotes
+  - Removed unnecessary parameters from group and group_snapshots create APIs
+  - Follow the new PTI for document build
+  - Fix the way to get backup metadata
+  - Deprecate multiattach flag on volume create
+  - Backup create is not available from 3.0 to 3.42
+  - Updated from global requirements
+
 -------------------------------------------------------------------
 Wed Dec 20 09:33:57 UTC 2017 - cloud-devel@suse.de
 
diff --git a/python-cinderclient.spec b/python-cinderclient.spec
index 8619e4e..b4d8ce6 100644
--- a/python-cinderclient.spec
+++ b/python-cinderclient.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-cinderclient
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,32 +16,47 @@
 #
 
 
-%global sname python-cinderclient
 Name:           python-cinderclient
-Version:        3.3.0
+Version:        3.4.0
 Release:        0
 Summary:        Python API and CLI for OpenStack Cinder
 License:        Apache-2.0
 Group:          Development/Languages/Python
-Url:            https://launchpad.net/%{sname}
-Source0:        https://files.pythonhosted.org/packages/source/p/%{sname}/%{sname}-%{version}.tar.gz
+Url:            https://launchpad.net/python-cinderclient
+Source0:        https://files.pythonhosted.org/packages/source/p/python-cinderclient/python-cinderclient-3.4.0.tar.gz
 BuildRequires:  openstack-macros
-BuildRequires:  python-PrettyTable >= 0.7.1
-BuildRequires:  python-ddt >= 1.0.1
 BuildRequires:  python-devel
-BuildRequires:  python-fixtures >= 3.0.0
-BuildRequires:  python-keystoneauth1 >= 3.2.0
-BuildRequires:  python-mock >= 2.0.0
-BuildRequires:  python-os-testr >= 1.0.0
-BuildRequires:  python-oslo.serialization >= 2.18.0
-BuildRequires:  python-oslo.utils >= 3.31.0
-BuildRequires:  python-pbr >= 2.0.0
-BuildRequires:  python-python-subunit >= 1.0.0
-BuildRequires:  python-requests >= 2.14.2
-BuildRequires:  python-requests-mock >= 1.1.0
-BuildRequires:  python-testrepository >= 0.0.18
-BuildRequires:  python-testscenarios >= 0.4
-BuildRequires:  python-testtools >= 2.2.0
+BuildRequires:  python2-PrettyTable >= 0.7.1
+BuildRequires:  python2-ddt >= 1.0.1
+BuildRequires:  python2-fixtures >= 3.0.0
+BuildRequires:  python2-keystoneauth1 >= 3.2.0
+BuildRequires:  python2-mock >= 2.0.0
+BuildRequires:  python2-os-testr >= 1.0.0
+BuildRequires:  python2-oslo.serialization >= 2.18.0
+BuildRequires:  python2-oslo.utils >= 3.31.0
+BuildRequires:  python2-pbr >= 2.0.0
+BuildRequires:  python2-python-subunit >= 1.0.0
+BuildRequires:  python2-requests >= 2.14.2
+BuildRequires:  python2-requests-mock >= 1.1.0
+BuildRequires:  python2-testrepository >= 0.0.18
+BuildRequires:  python2-testscenarios >= 0.4
+BuildRequires:  python2-testtools >= 2.2.0
+BuildRequires:  python3-PrettyTable >= 0.7.1
+BuildRequires:  python3-ddt >= 1.0.1
+BuildRequires:  python3-devel
+BuildRequires:  python3-fixtures >= 3.0.0
+BuildRequires:  python3-keystoneauth1 >= 3.2.0
+BuildRequires:  python3-mock >= 2.0.0
+BuildRequires:  python3-os-testr >= 1.0.0
+BuildRequires:  python3-oslo.serialization >= 2.18.0
+BuildRequires:  python3-oslo.utils >= 3.31.0
+BuildRequires:  python3-pbr >= 2.0.0
+BuildRequires:  python3-python-subunit >= 1.0.0
+BuildRequires:  python3-requests >= 2.14.2
+BuildRequires:  python3-requests-mock >= 1.1.0
+BuildRequires:  python3-testrepository >= 0.0.18
+BuildRequires:  python3-testscenarios >= 0.4
+BuildRequires:  python3-testtools >= 2.2.0
 Requires:       python-Babel >= 2.3.4
 Requires:       python-PrettyTable >= 0.7.1
 Requires:       python-keystoneauth1 >= 3.2.0
@@ -51,58 +66,78 @@ Requires:       python-requests >= 2.14.2
 Requires:       python-simplejson >= 3.5.1
 Requires:       python-six >= 1.10.0
 BuildArch:      noarch
+%if 0%{?suse_version}
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
+%else
+# on RDO, update-alternatives is in chkconfig
+Requires(post): chkconfig
+Requires(postun): chkconfig
+%endif
+%python_subpackages
 
 %description
 This is a client for the OpenStack Cinder API (Block Storage. There's a
 Python API (the cinderclient module), and a command-line script (cinder).
 Each implements 100% of the OpenStack Cinder API.
 
-%package doc
+%package -n python-cinderclient-doc
 Summary:        Documentation for OpenStack Cinder API Client
 Group:          Documentation/HTML
 BuildRequires:  python-Sphinx
 BuildRequires:  python-openstackdocstheme >= 1.17.0
 BuildRequires:  python-reno >= 2.5.0
 
-%description      doc
+%description -n python-cinderclient-doc
 This is a client for the OpenStack Cinder API (Block Storage. There's a
 Python API (the cinderclient module), and a command-line script (cinder).
 Each implements 100% of the OpenStack Cinder API.
 This package contains auto-generated documentation.
 
 %prep
-%autosetup -p1 -n %{sname}-%{version}
+%autosetup -p1 -n python-cinderclient-3.4.0
 %py_req_cleanup
 sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
 
 %build
-%{py2_build}
+%{python_build}
 
 %{__python2} setup.py build_sphinx --builder=html,man
 # remove the sphinx-build leftovers
 rm -rf doc/build/html/.{doctrees,buildinfo}
 
 %install
-%{py2_install}
+%{python_install}
 # man page
 install -p -D -m 644 doc/build/man/cinder.1 %{buildroot}%{_mandir}/man1/cinder.1
 # bash completion
 install -p -D -m 644 tools/cinder.bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/cinder.bash_completion
+%python_clone -a %{buildroot}%{_bindir}/cinder
+%python_clone -a %{buildroot}%{_mandir}/man1/cinder.1
+%python_clone -a %{buildroot}%{_sysconfdir}/bash_completion.d/cinder.bash_completion
+
+%post
+%{python_install_alternative cinder cinder.1 %{_sysconfdir}/bash_completion.d/cinder.bash_completion}
+
+%postun
+%python_uninstall_alternative cinder
 
 %check
 rm cinderclient/tests/unit/test_shell.py
+%{python_expand rm -rf .testrepository
 ostestr
+}
 
-%files
+%files %{python_files}
 %license LICENSE
 %doc README.rst ChangeLog
-%{python2_sitelib}/cinderclient
-%{python2_sitelib}/*.egg-info
-%{_bindir}/cinder
-%{_mandir}/man1/cinder.1*
-%{_sysconfdir}/bash_completion.d/cinder.bash_completion
+%{python_sitelib}/cinderclient
+%{python_sitelib}/*.egg-info
+%python_alternative %{_bindir}/cinder
+%python_alternative %{_mandir}/man1/cinder.1
+%python_alternative %{_sysconfdir}/bash_completion.d/cinder.bash_completion
 
-%files doc
+%files -n python-cinderclient-doc
 %license LICENSE
 %doc doc/build/html