diff --git a/CherryPy-3.3.0.tar.gz b/CherryPy-3.3.0.tar.gz
deleted file mode 100644
index ea4d501..0000000
--- a/CherryPy-3.3.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f8829bf1b4f613833b690b33b2fd00b1da4ef98df3c70240f78ee91b70f4a5a2
-size 429204
diff --git a/CherryPy-3.6.0.tar.gz b/CherryPy-3.6.0.tar.gz
new file mode 100644
index 0000000..8bee406
--- /dev/null
+++ b/CherryPy-3.6.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a149271819a15417104aa8f641ad5b96287070f0153e6ef2832a87e2c693d75d
+size 432881
diff --git a/python-CherryPy.changes b/python-CherryPy.changes
index 9acb4e8..ea9e0c4 100644
--- a/python-CherryPy.changes
+++ b/python-CherryPy.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Sun Feb 22 17:22:27 UTC 2015 - benoit.monin@gmx.fr
+
+- update to version 3.6.0:
+  * Fixed HTTP range headers for negative length larger than
+    content size
+  * Disabled universal wheel generation as wsgiserver has Python
+    duality
+  * Pull Request #42: Correct TypeError in ``check_auth`` when
+    encrypt is used
+  * Pull Request #59: Correct signature of HandlerWrapperTool
+  * Pull Request #60: Fix error in SessionAuth where login_screen
+    was incorrectly used
+  * Issue #1077: Support keyword-only arguments in dispatchers
+    (Python 3)
+  * Issue #1019: Allow logging host name in the access log
+  * Pull Request #50: Fixed race condition in session cleanup
+- changes from version 3.5.0:
+  * Issue #1301: When the incoming queue is full, now reject
+    additional connections. This functionality was added to
+    CherryPy 3.0, but unintentionally lost in 3.1
+- changes from version 3.4.0:
+  * Miscellaneous quality improvements
+- remove CFLAGS export
+- use update-alternatives for cherryd binary
+
 -------------------------------------------------------------------
 Tue May 20 12:25:05 UTC 2014 - toddrme2178@gmail.com
 
diff --git a/python-CherryPy.spec b/python-CherryPy.spec
index 086c552..868b8d3 100644
--- a/python-CherryPy.spec
+++ b/python-CherryPy.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-CherryPy
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -17,7 +17,7 @@
 
 
 Name:           python-CherryPy
-Version:        3.3.0
+Version:        3.6.0
 Release:        0
 Url:            http://www.cherrypy.org
 Summary:        Object-Oriented HTTP framework
@@ -26,6 +26,8 @@ Group:          Development/Languages/Python
 Source:         https://pypi.python.org/packages/source/C/CherryPy/CherryPy-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-devel
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
 %if 0%{?suse_version} && 0%{?suse_version} <= 1110
 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %else
@@ -51,7 +53,6 @@ Oh, and most importantly: CherryPy is fun to work with :-)
 %setup -q -n CherryPy-%{version}
 
 %build
-export CFLAGS="%{optflags}"
 python setup.py build
 
 %install
@@ -59,10 +60,27 @@ sed -i 's|\r||' README.txt # Fix wrong EOL encoding
 find . -name sessiondemo.py -type f -exec chmod 0755 {} \; # Fix non-executable bit rpmlint warning
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
+# update-alternatives
+mv %{buildroot}%{_bindir}/cherryd %{buildroot}%{_bindir}/cherryd-%{py_ver}
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives
+touch %{buildroot}%{_sysconfdir}/alternatives/cherryd
+ln -sf %{_sysconfdir}/alternatives/cherryd %{buildroot}%{_bindir}/cherryd
+
+%post
+update-alternatives \
+	--install %{_bindir}/cherryd cherryd %{_bindir}/cherryd-%{py_ver} 20
+
+%postun
+if [ $1 -eq 0 ] ; then
+	update-alternatives --remove cherryd %{_bindir}/cherryd-%{py_ver}
+fi
+
 %files
 %defattr(-,root,root,-)
 %doc README.txt
+%ghost %{_sysconfdir}/alternatives/cherryd
 %{_bindir}/cherryd
+%{_bindir}/cherryd-%{py_ver}
 %{python_sitelib}/cherrypy/
 %{python_sitelib}/CherryPy-%{version}-py%{py_ver}.egg-info