diff --git a/cloudpickle-0.1.1.tar.gz b/cloudpickle-0.1.1.tar.gz
deleted file mode 100644
index 3f22f1f..0000000
--- a/cloudpickle-0.1.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3418303f44c6c4daa184f1dc36c8c0b7ff8261c56d1f922ffd8d09e79caa4b74
-size 14479
diff --git a/cloudpickle-0.2.2.tar.gz b/cloudpickle-0.2.2.tar.gz
new file mode 100644
index 0000000..24c59a2
--- /dev/null
+++ b/cloudpickle-0.2.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9da26af07a25431d8a3c412d4c8e78823c1298655d354f4f570ece1b995f8e74
+size 17020
diff --git a/python-cloudpickle.changes b/python-cloudpickle.changes
index 50cd783..dd834e5 100644
--- a/python-cloudpickle.changes
+++ b/python-cloudpickle.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Thu May 11 03:26:35 UTC 2017 - toddrme2178@gmail.com
+
+- Implement singlespec version
+- Fix source URL.
+- Update to version 0.2.2
+  * Support Python 3.6
+  * Support Tornado Coroutines
+  * Support builtin methods
+- Update to version 0.2.1
+  * Packaging fix
+- Update to version 0.2.0
+  * Support `method_descriptor`
+  * Support unbound instancemethods
+  * Fixes for PyPy3
+  * More support for pickling dynamic imports
+
 -------------------------------------------------------------------
 Fri Jan 15 14:14:30 UTC 2016 - toddrme2178@gmail.com
 
diff --git a/python-cloudpickle.spec b/python-cloudpickle.spec
index 21ccee5..79f2dbb 100644
--- a/python-cloudpickle.spec
+++ b/python-cloudpickle.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-cloudpickle
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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,26 +16,32 @@
 #
 
 
+%bcond_without tests
+
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-cloudpickle
-Version:        0.1.1
+Version:        0.2.2
 Release:        0
 Summary:        Extended pickling support for Python objects
 License:        BSD-3-Clause
 Group:          Development/Languages/Python
 Url:            https://github.com/cloudpipe/cloudpickle
-Source:         https://pypi.python.org/packages/source/c/cloudpickle/cloudpickle-%{version}.tar.gz
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
-# Test requirements
-BuildRequires:  python-mock
-BuildRequires:  python-pytest
-BuildRequires:  python-pytest-cov
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%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
-BuildArch:      noarch
+Source:         https://files.pythonhosted.org/packages/source/c/cloudpickle/cloudpickle-%{version}.tar.gz
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module setuptools}
+%if %{with tests}
+BuildRequires:  %{python_module mock}
+BuildRequires:  %{python_module numpy}
+BuildRequires:  %{python_module pytest}
+BuildRequires:  %{python_module pytest-cov}
+BuildRequires:  %{python_module scipy}
+BuildRequires:  %{python_module tornado}
 %endif
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
+%python_subpackages
 
 %description
 The cloudpickle package makes it possible to serialize Python constructs
@@ -54,15 +60,20 @@ functions and classes defined interactively in the __main__ module.
 %setup -q -n cloudpickle-%{version}
 
 %build
-python setup.py build
+%python_build
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
 
+%if %{with tests}
 %check
-PYTHONPATH="./:%{buildroot}%{python_sitelib}" python setup.py test
+# Tests require very specific paths and py.test arguments
+export PYTHONPATH='.:tests'
+%python_expand py.test-%{$python_bin_suffix} -s
+%endif
 
-%files
+%files %{python_files}
 %defattr(-,root,root,-)
 %doc LICENSE README.md
 %{python_sitelib}/*